Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[1879] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2011-01-12 12:07:54
|
Revision: 1879
http://zoolib.svn.sourceforge.net/zoolib/?rev=1879&view=rev
Author: agreen
Date: 2011-01-12 12:07:45 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Conform to and/or take advantage of changes elsewhere.
Whitespace.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h
trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp
trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.h
trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.mm
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Rename.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_AsSQL.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_GetRelHead.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.h
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmap.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_PNG.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp
trunk/zoolib/source/cxx/zoolib/ZData_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZDelegate.h
trunk/zoolib/source/cxx/zoolib/ZDelegate.mm
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_BigRegion.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_HRGN.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_RgnHandle.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_XRegion.cpp
trunk/zoolib/source/cxx/zoolib/ZML.cpp
trunk/zoolib/source/cxx/zoolib/ZNatter.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Socket.h
trunk/zoolib/source/cxx/zoolib/ZSet_T.h
trunk/zoolib/source/cxx/zoolib/ZStackCrawl.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamMUX.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_SSL_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Compressed.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_CFType.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_NSObject.mm
trunk/zoolib/source/cxx/zoolib/ZUtil_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZValPred_GetNames.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Do_GetNames.cpp
trunk/zoolib/source/cxx/zoolib/ZWinCOM.h
trunk/zoolib/source/cxx/zoolib/ZWorkerRunner_CFRunLoop.cpp
trunk/zoolib/source/cxx/zoolib/ZWorkerRunner_EventLoop.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_CFType.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_ZooLib.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_ZooLibStream.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_ZooLibStrim.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -25,7 +25,7 @@
#include "zoolib/ZLog.h"
#include "zoolib/ZMemory.h"
#include "zoolib/ZStreamerCopier.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
using std::string;
using std::vector;
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -26,7 +26,7 @@
#include "zoolib/ZMemory.h" // For ZMemCopy
#include "zoolib/ZStream_Limited.h"
#include "zoolib/ZStream_SHA1.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include <deque>
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -20,7 +20,7 @@
#include "zoolib/blackberry/ZBlackBerry_Union.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
using std::pair;
using std::vector;
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -20,6 +20,7 @@
#include "zoolib/ZCallable_PMF.h"
#include "zoolib/ZLog.h"
+#include "zoolib/ZUtil_STL_map.h"
#include "zoolib/dataspace/ZDataspace_Dataspace.h"
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -18,8 +18,6 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#include "zoolib/ZUtil_STL.h"
-
#include "zoolib/dataspace/ZDataspace_Source.h"
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -20,6 +20,8 @@
#include "zoolib/ZCallable_PMF.h"
#include "zoolib/dataspace/ZDataspace_SourceMUX.h"
+#include "zoolib/ZUtil_STL_map.h"
+#include "zoolib/ZUtil_STL_vector.h"
namespace ZooLib {
namespace ZDataspace {
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -20,6 +20,7 @@
#include "zoolib/ZCallable_PMF.h"
#include "zoolib/ZWorker_Callable.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include "zoolib/dataspace/ZDataspace_SourceServer.h"
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -20,7 +20,8 @@
#include "zoolib/ZCallable_PMF.h"
#include "zoolib/ZWorker_Callable.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_map.h"
+#include "zoolib/ZUtil_STL_set.h"
#include "zoolib/dataspace/ZDataspace_Source_Client.h"
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Dataset.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -23,7 +23,7 @@
#include "zoolib/ZStrim_Stream.h"
#include "zoolib/ZStrimU_Unreader.h"
#include "zoolib/ZStrimmer_Streamer.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_map.h"
#include "zoolib/ZYad_Any.h"
#include "zoolib/ZYad_ZooLibStrim.h"
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -21,7 +21,7 @@
#include "zoolib/ZCallable_PMF.h"
#include "zoolib/ZLog.h"
#include "zoolib/ZString.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_map.h"
#include "zoolib/ZUtil_STL_set.h"
#include "zoolib/ZWorker_Callable.h"
#include "zoolib/ZWorkerRunner_CFRunLoop.h"
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -21,7 +21,8 @@
#include "zoolib/ZCallable_PMF.h"
#include "zoolib/ZExpr_Bool_ValPred.h"
#include "zoolib/ZLog.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_map.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include "zoolib/ZValPred_GetNames.h"
#include "zoolib/ZVisitor_Expr_Bool_ValPred_Do_GetNames.h"
#include "zoolib/ZVisitor_Expr_Op_Do_Transform_T.h"
@@ -127,6 +128,9 @@
// From ZCounted
virtual void Finalize();
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor);
+
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
@@ -174,6 +178,14 @@
inherited::Finalize();
}
+void Source_Union::Proxy::Accept(ZVisitor& iVisitor)
+ {
+ if (Visitor_Proxy* theVisitor = dynamic_cast<Visitor_Proxy*>(&iVisitor))
+ this->Accept_Proxy(*theVisitor);
+ else
+ inherited::Accept(iVisitor);
+ }
+
void Source_Union::Proxy::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZRA::Expr_Rel>& iVisitor)
{
if (Visitor_Proxy* theVisitor = dynamic_cast<Visitor_Proxy*>(&iVisitor))
@@ -622,7 +634,7 @@
// Remove any searches that need it
while (iRemovedCount--)
{
- int64 theRefcon = *iRemoved++;
+ const int64 theRefcon = *iRemoved++;
Map_Refcon_ClientSearch::iterator iterClientSearch =
fMap_Refcon_ClientSearch.find(theRefcon);
@@ -742,9 +754,7 @@
for (DListEraser<PSource, DLink_PSource_CollectFrom>
eraserPSource = fPSource_CollectFrom; eraserPSource; eraserPSource.Advance())
- {
- this->pCollectFrom(eraserPSource.Current());
- }
+ { this->pCollectFrom(eraserPSource.Current()); }
// -----
@@ -850,7 +860,7 @@
PSource& thePSource = iterSources->second;
if (thePSource.Intersects(theProxy->fRelHead))
{
- int64 theRefcon = thePSource.fNextRefcon++;
+ const int64 theRefcon = thePSource.fNextRefcon++;
PIP* thePIP = &thePSource.fMap_Refcon_PIP.insert(
make_pair(theRefcon, PIP())).first->second;
@@ -977,10 +987,9 @@
thePIP->fEvent = iterSearchResults->GetEvent();
for (set<PSearch*>::iterator
i = thePIP->fProxy->fDependentPSearches.begin(),
- end = thePIP->fProxy->fDependentPSearches.end(); i != end; ++i)
- {
- fPSearch_NeedsWork.InsertIfNotContains(*i);
- }
+ end = thePIP->fProxy->fDependentPSearches.end();
+ i != end; ++i)
+ { fPSearch_NeedsWork.InsertIfNotContains(*i); }
}
}
}
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h 2011-01-12 12:07:45 UTC (rev 1879)
@@ -72,15 +72,9 @@
class Proxy;
class Visitor_Proxy;
- struct Comparator_Proxy
- {
- bool operator()(Proxy* iLeft, Proxy* iRight) const;
+ struct Comparator_Proxy : public std::binary_function<Proxy*,Proxy*,bool>
+ { bool operator()(Proxy* iLeft, Proxy* iRight) const; };
- typedef Proxy* first_argument_type;
- typedef Proxy* second_argument_type;
- typedef bool result_type;
- };
-
typedef std::set<Proxy*, Comparator_Proxy> ProxySet;
ProxySet fProxySet;
Modified: trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -448,10 +448,7 @@
{ return inherited::Get(); }
JSValueRef& Value::OParam()
- {
- inherited::Clear();
- return inherited::GetPtrRef();
- }
+ { return inherited::OParam(); }
Value::Value()
{}
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -26,7 +26,7 @@
#include "zoolib/ZDebug.h"
#include "zoolib/ZMemory.h"
#include "zoolib/netscape/ZNetscape_Macros.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include <string>
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -25,7 +25,7 @@
#include "zoolib/ZDebug.h"
#include "zoolib/ZMemory.h" // For ZBlockZero
#include "zoolib/netscape/ZNetscape_Macros.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include <stdexcept>
#include <stdlib.h> // For free/malloc
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -27,7 +27,7 @@
#include "zoolib/ZNet_Internet.h"
#include "zoolib/ZStream_Data_T.h"
#include "zoolib/ZString.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include "zoolib/ZWorker.h"
#include <stdlib.h> // For malloc/free
Modified: trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.h 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.h 2011-01-12 12:07:45 UTC (rev 1879)
@@ -320,24 +320,24 @@
// From UITableViewDataSource
- (NSInteger)numberOfSectionsInTableView:(UITableView*)tableView;
- (NSInteger)tableView:(UITableView*)tableView numberOfRowsInSection:(NSInteger)section;
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath;
+- (void)tableView:(UITableView*)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath*)indexPath;
- (UITableViewCell*)tableView:(UITableView*)tableView cellForRowAtIndexPath:(NSIndexPath*)indexPath;
// From UITableViewDelegate
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath;
-- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section;
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section;
+- (CGFloat)tableView:(UITableView*)tableView heightForRowAtIndexPath:(NSIndexPath*)indexPath;
+- (CGFloat)tableView:(UITableView*)tableView heightForHeaderInSection:(NSInteger)section;
+- (CGFloat)tableView:(UITableView*)tableView heightForFooterInSection:(NSInteger)section;
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section;
-- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section;
+- (NSString*)tableView:(UITableView*)tableView titleForHeaderInSection:(NSInteger)section;
+- (NSString*)tableView:(UITableView*)tableView titleForFooterInSection:(NSInteger)section;
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section;
-- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section;
+- (UIView*)tableView:(UITableView*)tableView viewForHeaderInSection:(NSInteger)section;
+- (UIView*)tableView:(UITableView*)tableView viewForFooterInSection:(NSInteger)section;
-- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath;
+- (void)tableView:(UITableView*)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath*)indexPath;
- (void)tableView:(UITableView*)tableView didSelectRowAtIndexPath:(NSIndexPath*)indexPath;
-- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath;
+- (UITableViewCellEditingStyle)tableView:(UITableView*)tableView editingStyleForRowAtIndexPath:(NSIndexPath*)indexPath;
// Our protocol
- (void)appendSection:(ZooLib::ZRef<ZooLib::UIKit::Section>) iSection;
Modified: trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.mm
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.mm 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.mm 2011-01-12 12:07:45 UTC (rev 1879)
@@ -25,7 +25,8 @@
#include "zoolib/ZLog.h"
#include "zoolib/ZRef_NSObject.h"
#include "zoolib/ZUtil_NSObject.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_map.h"
+#include "zoolib/ZUtil_STL_set.h"
namespace ZooLib {
namespace UIKit {
@@ -574,7 +575,7 @@
@implementation UITVController_WithSections
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+- (id)initWithNibName:(NSString*)nibNameOrNil bundle:(NSBundle*)nibBundleOrNil
{
[super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
fCallable_NeedsUpdate = MakeCallable<void()>(self, @selector(needsUpdate));
@@ -611,16 +612,16 @@
return 0;
}
-- (void)tableView:(UITableView *)tableView
+- (void)tableView:(UITableView*)tableView
commitEditingStyle:(UITableViewCellEditingStyle)editingStyle
- forRowAtIndexPath:(NSIndexPath *)indexPath
+ forRowAtIndexPath:(NSIndexPath*)indexPath
{
if (ZRef<Section> theSection = [self pGetSection:indexPath.section])
theSection->GetBody()->CommitEditingStyle(editingStyle, indexPath.row);
}
-- (NSIndexPath *)tableView:(UITableView *)tableView
- willSelectRowAtIndexPath:(NSIndexPath *)indexPath
+- (NSIndexPath*)tableView:(UITableView*)tableView
+ willSelectRowAtIndexPath:(NSIndexPath*)indexPath
{
if (ZRef<Section> theSection = [self pGetSection:indexPath.section])
{
@@ -688,7 +689,7 @@
return nullptr;
}
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+- (CGFloat)tableView:(UITableView*)tableView heightForRowAtIndexPath:(NSIndexPath*)indexPath
{
if (ZRef<Section> theSection = [self pGetSection:indexPath.section])
{
@@ -699,7 +700,7 @@
return result;
}
-- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+- (CGFloat)tableView:(UITableView*)tableView heightForHeaderInSection:(NSInteger)section
{
if (ZRef<Section> theSection = [self pGetSection:section])
{
@@ -709,7 +710,7 @@
return tableView.sectionHeaderHeight;
}
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+- (CGFloat)tableView:(UITableView*)tableView heightForFooterInSection:(NSInteger)section
{
if (ZRef<Section> theSection = [self pGetSection:section])
{
@@ -719,7 +720,7 @@
return tableView.sectionFooterHeight;
}
-- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+- (NSString*)tableView:(UITableView*)tableView titleForHeaderInSection:(NSInteger)section
{
if (ZRef<Section> theSection = [self pGetSection:section])
{
@@ -729,7 +730,7 @@
return nullptr;
}
-- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
+- (NSString*)tableView:(UITableView*)tableView titleForFooterInSection:(NSInteger)section
{
if (ZRef<Section> theSection = [self pGetSection:section])
{
@@ -739,7 +740,7 @@
return nullptr;
}
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+- (UIView*)tableView:(UITableView*)tableView viewForHeaderInSection:(NSInteger)section
{
if (ZRef<Section> theSection = [self pGetSection:section])
{
@@ -749,7 +750,7 @@
return nullptr;
}
-- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
+- (UIView*)tableView:(UITableView*)tableView viewForFooterInSection:(NSInteger)section
{
if (ZRef<Section> theSection = [self pGetSection:section])
{
@@ -759,8 +760,8 @@
return nullptr;
}
-- (void)tableView:(UITableView *)tableView
- accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath
+- (void)tableView:(UITableView*)tableView
+ accessoryButtonTappedForRowWithIndexPath:(NSIndexPath*)indexPath
{
if (ZRef<Section> theSection = [self pGetSection:indexPath.section])
theSection->GetBody()->ButtonTapped(self, tableView, indexPath, indexPath.row);
@@ -772,8 +773,8 @@
theSection->GetBody()->RowSelected(self, tableView, indexPath, indexPath.row);
}
-- (BOOL)tableView:(UITableView *)tableView
- shouldIndentWhileEditingRowAtIndexPath:(NSIndexPath *)indexPath
+- (BOOL)tableView:(UITableView*)tableView
+ shouldIndentWhileEditingRowAtIndexPath:(NSIndexPath*)indexPath
{
if (ZRef<Section> theSection = [self pGetSection:indexPath.section])
{
@@ -783,8 +784,8 @@
return true;
}
-- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView
- editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath
+- (UITableViewCellEditingStyle)tableView:(UITableView*)tableView
+ editingStyleForRowAtIndexPath:(NSIndexPath*)indexPath
{
if (ZRef<Section> theSection = [self pGetSection:indexPath.section])
{
@@ -794,8 +795,8 @@
return UITableViewCellEditingStyleNone;
}
-- (NSInteger)tableView:(UITableView *)tableView
- indentationLevelForRowAtIndexPath:(NSIndexPath *)indexPath
+- (NSInteger)tableView:(UITableView*)tableView
+ indentationLevelForRowAtIndexPath:(NSIndexPath*)indexPath
{
if (ZRef<Section> theSection = [self pGetSection:indexPath.section])
{
Modified: trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Rename.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Rename.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Rename.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -18,7 +18,7 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_map.h"
#include "zoolib/zqe/ZQE_Walker_Rename.h"
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_AsSQL.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_AsSQL.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_AsSQL.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -23,6 +23,7 @@
#include "zoolib/ZString.h"
#include "zoolib/ZUtil_Any.h"
#include "zoolib/ZUtil_Strim.h"
+#include "zoolib/ZUtil_STL_map.h"
#include "zoolib/ZVisitor_Do_T.h"
#include "zoolib/ZVisitor_Expr_Bool_ValPred_Any_ToStrim.h"
#include "zoolib/ZVisitor_Expr_Op_Do_Transform_T.h"
@@ -221,7 +222,7 @@
const string8 realTableName = found.Get()->first;
const string8 realTableNameUnderscore = realTableName + "_";
const int numericSuffix = fTablesUsed[realTableName]++;
- const string8 usedTableName = realTableName + ZStringf("%d",numericSuffix);
+ const string8 usedTableName = realTableName + ZStringf("%d", numericSuffix);
const string8 usedTableNameDot = usedTableName + ".";
Thing theThing;
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_GetRelHead.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_GetRelHead.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_GetRelHead.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -18,7 +18,6 @@
OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------------------------------------------------------- */
-#include "zoolib/ZUtil_STL.h"
#include "zoolib/ZVisitor_Do_T.h"
#include "zoolib/zra/ZRA_Expr_Rel_Calc.h"
#include "zoolib/zra/ZRA_Expr_Rel_Const.h"
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.h 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.h 2011-01-12 12:07:45 UTC (rev 1879)
@@ -26,6 +26,7 @@
#include "zoolib/zra/ZRA_RelName.h"
+#include <map>
#include <set>
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -23,7 +23,8 @@
#include "zoolib/ZCompat_algorithm.h"
#include "zoolib/ZMemory.h"
#include "zoolib/ZStream_Memory.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_map.h"
+#include "zoolib/ZUtil_STL_set.h"
#include <cstdio>
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmap.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmap.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmap.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -425,7 +425,7 @@
if (iMungeColorTable)
{
if (PixelDescRep_Indexed* thePixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(fRep->GetPixelDesc().GetRep()))
+ fRep->GetPixelDesc().GetRep().DynamicCast<PixelDescRep_Indexed>())
{
const ZRGBA_POD* theColors;
size_t theCount;
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -130,11 +130,11 @@
ZRef<PDRep> mattePDRep = iMattePD.GetRep();
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* sourcePDRep_Color = ZRefDynamicCast<PDRep_Color>(sourcePDRep))
+ if (PDRep_Color* sourcePDRep_Color = sourcePDRep.DynamicCast<PDRep_Color>())
{
- if (PDRep_Color* mattePDRep_Color = ZRefDynamicCast<PDRep_Color>(mattePDRep))
+ if (PDRep_Color* mattePDRep_Color = mattePDRep.DynamicCast<PDRep_Color>())
{
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sBlit_T(iSourceAddress, iSourceRD, *sourcePDRep_Color,
sourceStart,
@@ -175,11 +175,11 @@
ZRef<PDRep> mattePDRep = iMattePD.GetRep();
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* sourcePDRep_Color = ZRefDynamicCast<PDRep_Color>(sourcePDRep))
+ if (PDRep_Color* sourcePDRep_Color = sourcePDRep.DynamicCast<PDRep_Color>())
{
- if (PDRep_Color* mattePDRep_Color = ZRefDynamicCast<PDRep_Color>(mattePDRep))
+ if (PDRep_Color* mattePDRep_Color = mattePDRep.DynamicCast<PDRep_Color>())
{
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sBlit_T(iSourceAddress, iSourceRD, *sourcePDRep_Color,
sourceStart,
@@ -203,15 +203,15 @@
EOp iOp)
{
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sColor_T(iDestAddress, iDestRD, iDestB, *destPDRep_Color, iColor, iOp);
}
- else if (PDRep_Indexed* destPDRep_Indexed = ZRefDynamicCast<PDRep_Indexed>(destPDRep))
+ else if (PDRep_Indexed* destPDRep_Indexed = destPDRep.DynamicCast<PDRep_Indexed>())
{
sColor_T(iDestAddress, iDestRD, iDestB, *destPDRep_Indexed, iColor, iOp);
}
- else if (PDRep_Gray* destPDRep_Gray = ZRefDynamicCast<PDRep_Gray>(destPDRep))
+ else if (PDRep_Gray* destPDRep_Gray = destPDRep.DynamicCast<PDRep_Gray>())
{
sColor_T(iDestAddress, iDestRD, iDestB, *destPDRep_Gray, iColor, iOp);
}
@@ -236,9 +236,9 @@
ZRef<PDRep> mattePDRep = iMattePD.GetRep();
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* mattePDRep_Color = ZRefDynamicCast<PDRep_Color>(mattePDRep))
+ if (PDRep_Color* mattePDRep_Color = mattePDRep.DynamicCast<PDRep_Color>())
{
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sColor_T(iMatteAddress, iMatteRD, *mattePDRep_Color,
matteStart,
@@ -248,9 +248,9 @@
return;
}
}
- else if (PDRep_Gray* mattePDRep_Gray = ZRefDynamicCast<PDRep_Gray>(mattePDRep))
+ else if (PDRep_Gray* mattePDRep_Gray = mattePDRep.DynamicCast<PDRep_Gray>())
{
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sColor_T(iMatteAddress, iMatteRD, *mattePDRep_Gray,
matteStart,
@@ -286,15 +286,15 @@
void* iDestAddress, const RD& iDestRD, const ZRectPOD& iDestB, const PD& iDestPD)
{
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sInvert_T(iDestAddress, iDestRD, iDestB, *destPDRep_Color);
}
- else if (PDRep_Indexed* destPDRep_Indexed = ZRefDynamicCast<PDRep_Indexed>(destPDRep))
+ else if (PDRep_Indexed* destPDRep_Indexed = destPDRep.DynamicCast<PDRep_Indexed>())
{
sInvert_T(iDestAddress, iDestRD, iDestB, *destPDRep_Indexed);
}
- else if (PDRep_Gray* destPDRep_Gray = ZRefDynamicCast<PDRep_Gray>(destPDRep))
+ else if (PDRep_Gray* destPDRep_Gray = destPDRep.DynamicCast<PDRep_Gray>())
{
sInvert_T(iDestAddress, iDestRD, iDestB, *destPDRep_Gray);
}
@@ -308,15 +308,15 @@
void* iDestAddress, const RD& iDestRD, const ZRectPOD& iDestB, const PD& iDestPD, uint16 iAmount)
{
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sOpaque_T(iDestAddress, iDestRD, iDestB, *destPDRep_Color, iAmount);
}
- else if (PDRep_Indexed* destPDRep_Indexed = ZRefDynamicCast<PDRep_Indexed>(destPDRep))
+ else if (PDRep_Indexed* destPDRep_Indexed = destPDRep.DynamicCast<PDRep_Indexed>())
{
sOpaque_T(iDestAddress, iDestRD, iDestB, *destPDRep_Indexed, iAmount);
}
- else if (PDRep_Gray* destPDRep_Gray = ZRefDynamicCast<PDRep_Gray>(destPDRep))
+ else if (PDRep_Gray* destPDRep_Gray = destPDRep.DynamicCast<PDRep_Gray>())
{
sOpaque_T(iDestAddress, iDestRD, iDestB, *destPDRep_Gray, iAmount);
}
@@ -330,15 +330,15 @@
void* iDestAddress, const RD& iDestRD, const ZRectPOD& iDestB, const PD& iDestPD, uint16 iAmount)
{
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sDarken_T(iDestAddress, iDestRD, iDestB, *destPDRep_Color, iAmount);
}
- else if (PDRep_Indexed* destPDRep_Indexed = ZRefDynamicCast<PDRep_Indexed>(destPDRep))
+ else if (PDRep_Indexed* destPDRep_Indexed = destPDRep.DynamicCast<PDRep_Indexed>())
{
sDarken_T(iDestAddress, iDestRD, iDestB, *destPDRep_Indexed, iAmount);
}
- else if (PDRep_Gray* destPDRep_Gray = ZRefDynamicCast<PDRep_Gray>(destPDRep))
+ else if (PDRep_Gray* destPDRep_Gray = destPDRep.DynamicCast<PDRep_Gray>())
{
sDarken_T(iDestAddress, iDestRD, iDestB, *destPDRep_Gray, iAmount);
}
@@ -352,15 +352,15 @@
void* iDestAddress, const RD& iDestRD, const ZRectPOD& iDestB, const PD& iDestPD, uint16 iAmount)
{
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sFade_T(iDestAddress, iDestRD, iDestB, *destPDRep_Color, iAmount);
}
- else if (PDRep_Indexed* destPDRep_Indexed = ZRefDynamicCast<PDRep_Indexed>(destPDRep))
+ else if (PDRep_Indexed* destPDRep_Indexed = destPDRep.DynamicCast<PDRep_Indexed>())
{
sFade_T(iDestAddress, iDestRD, iDestB, *destPDRep_Indexed, iAmount);
}
- else if (PDRep_Gray* destPDRep_Gray = ZRefDynamicCast<PDRep_Gray>(destPDRep))
+ else if (PDRep_Gray* destPDRep_Gray = destPDRep.DynamicCast<PDRep_Gray>())
{
sFade_T(iDestAddress, iDestRD, iDestB, *destPDRep_Gray, iAmount);
}
@@ -385,9 +385,9 @@
ZRef<PDRep> mattePDRep = iMattePD.GetRep();
ZRef<PDRep> destPDRep = iDestPD.GetRep();
- if (PDRep_Color* mattePDRep_Color = ZRefDynamicCast<PDRep_Color>(mattePDRep))
+ if (PDRep_Color* mattePDRep_Color = mattePDRep.DynamicCast<PDRep_Color>())
{
- if (PDRep_Color* destPDRep_Color = ZRefDynamicCast<PDRep_Color>(destPDRep))
+ if (PDRep_Color* destPDRep_Color = destPDRep.DynamicCast<PDRep_Color>())
{
sApplyMatte_T(iMatteAddress, iMatteRD, *mattePDRep_Color,
matteStart,
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -96,7 +96,7 @@
ZRef<PixelDescRep> thePixelDescRep = iPixelDesc.GetRep();
if (PixelDescRep_Indexed* thePixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(thePixelDescRep))
+ thePixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
destPixvalDesc.fDepth = spNearestIndexedDepth(iRasterDesc.fPixvalDesc.fDepth);
destPixelDesc = thePixelDescRep_Indexed;
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -125,7 +125,7 @@
const ZRectPOD& iBounds)
{
ZRef<PixelDescRep_Indexed> thePixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(iPixelDesc.GetRep());
+ iPixelDesc.GetRep().DynamicCast<PixelDescRep_Indexed>();
ZAssertStop(2, thePixelDescRep_Indexed);
if (fTransparent)
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -352,7 +352,7 @@
ZRef<PixelDescRep> thePixelDescRep = iPixelDesc.GetRep();
- if (ZRefDynamicCast<PixelDescRep_Gray>(thePixelDescRep))
+ if (thePixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
theJCS.input_components = 1;
theJCS.in_color_space = JCS_GRAYSCALE;
@@ -381,10 +381,10 @@
// Special-case RGB sources.
bool done = false;
if (PixelDescRep_Color* thePixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(thePixelDescRep))
+ thePixelDescRep.DynamicCast<PixelDescRep_Color>())
{
PixelDescRep_Color* destPDR =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDesc.GetRep());
+ destPixelDesc.GetRep().DynamicCast<PixelDescRep_Color>();
if (false && thePixelDescRep_Color->Matches(destPDR))
{
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_PNG.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_PNG.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_PNG.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -122,7 +122,7 @@
ZRef<PixelDescRep> thePixelDescRep = iPixelDesc.GetRep();
if (PixelDescRep_Indexed* thePixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(thePixelDescRep))
+ thePixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
::png_set_IHDR(write_ptr, info_ptr, iBounds.Width(), iBounds.Height(), 8,
PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
@@ -145,7 +145,7 @@
destPixvalDesc.fDepth = 8;
destPixvalDesc.fBigEndian = true;
}
- else if (ZRefDynamicCast<PixelDescRep_Color>(thePixelDescRep))
+ else if (thePixelDescRep.DynamicCast<PixelDescRep_Color>())
{
int colorType;
if (thePixelDescRep->HasAlpha())
@@ -163,7 +163,7 @@
::png_set_IHDR(write_ptr, info_ptr, iBounds.Width(), iBounds.Height(), 8,
colorType, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
}
- else if (ZRefDynamicCast<PixelDescRep_Gray>(thePixelDescRep))
+ else if (thePixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
int colorType;
if (thePixelDescRep->HasAlpha())
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -2430,20 +2430,20 @@
{
ZRef<PixelDescRep> thePixelDescRep = iPixelDesc.GetRep();
if (PixelDescRep_Color* thePixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(thePixelDescRep))
+ thePixelDescRep.DynamicCast<PixelDescRep_Color>())
{
sMunge_T(iBaseAddress, iRasterDesc,
*thePixelDescRep_Color, *thePixelDescRep_Color, iBounds, iMungeProc, iRefcon);
}
else if (PixelDescRep_Indexed* thePixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(thePixelDescRep))
+ thePixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
thePixelDescRep_Indexed->BuildReverseLookupIfNeeded();
sMunge_T(iBaseAddress, iRasterDesc,
*thePixelDescRep_Indexed, *thePixelDescRep_Indexed, iBounds, iMungeProc, iRefcon);
}
else if (PixelDescRep_Gray* thePixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(thePixelDescRep))
+ thePixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
sMunge_T(iBaseAddress, iRasterDesc,
*thePixelDescRep_Gray, *thePixelDescRep_Gray, iBounds, iMungeProc, iRefcon);
@@ -2641,10 +2641,10 @@
ZRef<PixelDescRep> destPixelDescRep = iDestPixelDesc.GetRep();
if (PixelDescRep_Color* sourcePixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(sourcePixelDescRep))
+ sourcePixelDescRep.DynamicCast<PixelDescRep_Color>())
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
if (!iInvertColors && sourcePixelDescRep_Color->Matches(destPixelDescRep_Color))
{
@@ -2660,7 +2660,7 @@
}
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
destPixelDescRep_Indexed->BuildReverseLookupIfNeeded();
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, *sourcePixelDescRep_Color,
@@ -2668,7 +2668,7 @@
iSourceBounds, iDestLocation, iInvertColors);
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, *sourcePixelDescRep_Color,
iDestBase, iDestRasterDesc, *destPixelDescRep_Gray,
@@ -2682,17 +2682,17 @@
}
}
else if (PixelDescRep_Indexed* sourcePixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(sourcePixelDescRep))
+ sourcePixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, *sourcePixelDescRep_Indexed,
iDestBase, iDestRasterDesc, *destPixelDescRep_Color,
iSourceBounds, iDestLocation, iInvertColors);
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
if (!iInvertColors && sourcePixelDescRep_Indexed->Matches(destPixelDescRep_Indexed))
{
@@ -2709,7 +2709,7 @@
}
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, *sourcePixelDescRep_Indexed,
iDestBase, iDestRasterDesc, *destPixelDescRep_Gray,
@@ -2723,17 +2723,17 @@
}
}
else if (PixelDescRep_Gray* sourcePixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(sourcePixelDescRep))
+ sourcePixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, *sourcePixelDescRep_Gray,
iDestBase, iDestRasterDesc, *destPixelDescRep_Color,
iSourceBounds, iDestLocation, iInvertColors);
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
destPixelDescRep_Indexed->BuildReverseLookupIfNeeded();
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, *sourcePixelDescRep_Gray,
@@ -2741,7 +2741,7 @@
iSourceBounds, iDestLocation, iInvertColors);
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
if (!iInvertColors && sourcePixelDescRep_Gray->Matches(destPixelDescRep_Gray))
{
@@ -2766,14 +2766,14 @@
else
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, iSourcePixelDesc,
iDestBase, iDestRasterDesc, *destPixelDescRep_Color,
iSourceBounds, iDestLocation, iInvertColors);
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
destPixelDescRep_Indexed->BuildReverseLookupIfNeeded();
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, iSourcePixelDesc,
@@ -2781,7 +2781,7 @@
iSourceBounds, iDestLocation, iInvertColors);
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
sBlitWithMaps_T(iSourceBase, iSourceRasterDesc, iSourcePixelDesc,
iDestBase, iDestRasterDesc, *destPixelDescRep_Gray,
@@ -2867,10 +2867,10 @@
ZRef<PixelDescRep> destPixelDescRep = iDestPixelDesc.GetRep();
if (PixelDescRep_Color* sourcePixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(sourcePixelDescRep))
+ sourcePixelDescRep.DynamicCast<PixelDescRep_Color>())
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
if (!iInvertColors && sourcePixelDescRep_Color->Matches(destPixelDescRep_Color))
{
@@ -2890,7 +2890,7 @@
}
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
destPixelDescRep_Indexed->BuildReverseLookupIfNeeded();
sBlitRowWithMaps_T(
@@ -2901,7 +2901,7 @@
iCount, iInvertColors);
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
sBlitRowWithMaps_T(
iSourceBase, iSourcePixvalDesc, *sourcePixelDescRep_Color,
@@ -2921,10 +2921,10 @@
}
}
else if (PixelDescRep_Indexed* sourcePixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(sourcePixelDescRep))
+ sourcePixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
sBlitRowWithMaps_T(
iSourceBase, iSourcePixvalDesc, *sourcePixelDescRep_Indexed,
@@ -2934,7 +2934,7 @@
iCount, iInvertColors);
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
if (!iInvertColors && sourcePixelDescRep_Indexed->Matches(destPixelDescRep_Indexed))
{
@@ -2957,7 +2957,7 @@
}
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
sBlitRowWithMaps_T(
iSourceBase, iSourcePixvalDesc, *sourcePixelDescRep_Indexed,
@@ -2977,10 +2977,10 @@
}
}
else if (PixelDescRep_Gray* sourcePixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(sourcePixelDescRep))
+ sourcePixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
sBlitRowWithMaps_T(
iSourceBase, iSourcePixvalDesc, *sourcePixelDescRep_Gray,
@@ -2990,7 +2990,7 @@
iCount, iInvertColors);
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
destPixelDescRep_Indexed->BuildReverseLookupIfNeeded();
sBlitRowWithMaps_T(
@@ -3001,7 +3001,7 @@
iCount, iInvertColors);
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
if (!iInvertColors && sourcePixelDescRep_Gray->Matches(destPixelDescRep_Gray))
{
@@ -3035,7 +3035,7 @@
else
{
if (PixelDescRep_Color* destPixelDescRep_Color =
- ZRefDynamicCast<PixelDescRep_Color>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Color>())
{
sBlitRowWithMaps_T(
iSourceBase, iSourcePixvalDesc, iSourcePixelDesc,
@@ -3045,7 +3045,7 @@
iCount, iInvertColors);
}
else if (PixelDescRep_Indexed* destPixelDescRep_Indexed =
- ZRefDynamicCast<PixelDescRep_Indexed>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Indexed>())
{
destPixelDescRep_Indexed->BuildReverseLookupIfNeeded();
sBlitRowWithMaps_T(
@@ -3056,7 +3056,7 @@
iCount, iInvertColors);
}
else if (PixelDescRep_Gray* destPixelDescRep_Gray =
- ZRefDynamicCast<PixelDescRep_Gray>(destPixelDescRep))
+ destPixelDescRep.DynamicCast<PixelDescRep_Gray>())
{
sBlitRowWithMaps_T(
iSourceBase, iSourcePixvalDesc, iSourcePixelDesc,
Modified: trunk/zoolib/source/cxx/zoolib/ZData_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZData_Any.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZData_Any.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -22,7 +22,7 @@
#include "zoolib/ZCompare_Vector.h"
#include "zoolib/ZCountedWithoutFinalize.h"
#include "zoolib/ZData_Any.h"
-#include "zoolib/ZUtil_STL.h"
+#include "zoolib/ZUtil_STL_vector.h"
#include <vector>
Modified: trunk/zoolib/source/cxx/zoolib/ZDelegate.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDelegate.h 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDelegate.h 2011-01-12 12:07:45 UTC (rev 1879)
@@ -167,7 +167,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 0 params)
template <class R>
-class ZDelegate::Wrapper_T<R(void)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(void)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -193,7 +194,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 0 params, void return)
template <>
-class ZDelegate::Wrapper_T<void(void)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(void)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -219,7 +221,8 @@
template <class R,
class P0>
-class ZDelegate::Wrapper_T<R(P0)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -249,7 +252,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 1 param, void return)
template <class P0>
-class ZDelegate::Wrapper_T<void(P0)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -279,7 +283,8 @@
template <class R,
class P0, class P1>
-class ZDelegate::Wrapper_T<R(P0,P1)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0,P1)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -311,7 +316,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 2 params, void return)
template <class P0, class P1>
-class ZDelegate::Wrapper_T<void(P0,P1)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0,P1)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -343,7 +349,8 @@
template <class R,
class P0, class P1, class P2>
-class ZDelegate::Wrapper_T<R(P0,P1,P2)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0,P1,P2)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -377,7 +384,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 3 params, void return)
template <class P0, class P1, class P2>
-class ZDelegate::Wrapper_T<void(P0,P1,P2)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0,P1,P2)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -411,7 +419,8 @@
template <class R,
class P0, class P1, class P2, class P3>
-class ZDelegate::Wrapper_T<R(P0,P1,P2,P3)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0,P1,P2,P3)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -447,7 +456,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 4 params, void return)
template <class P0, class P1, class P2, class P3>
-class ZDelegate::Wrapper_T<void(P0,P1,P2,P3)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0,P1,P2,P3)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -483,7 +493,8 @@
template <class R,
class P0, class P1, class P2, class P3, class P4>
-class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -522,7 +533,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 5 params, void return)
template <class P0, class P1, class P2, class P3, class P4>
-class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -561,7 +573,8 @@
template <class R,
class P0, class P1, class P2, class P3, class P4, class P5>
-class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4,P5)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4,P5)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -602,7 +615,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 6 params, void return)
template <class P0, class P1, class P2, class P3, class P4, class P5>
-class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4,P5)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4,P5)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -643,7 +657,8 @@
template <class R,
class P0, class P1, class P2, class P3, class P4, class P5, class P6>
-class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4,P5,P6)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4,P5,P6)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -686,7 +701,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 7 params, void return)
template <class P0, class P1, class P2, class P3, class P4, class P5, class P6>
-class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4,P5,P6)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4,P5,P6)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -729,7 +745,8 @@
template <class R,
class P0, class P1, class P2, class P3, class P4, class P5, class P6, class P7>
-class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4,P5,P6,P7)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<R(P0,P1,P2,P3,P4,P5,P6,P7)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
@@ -774,7 +791,8 @@
#pragma mark * ZDelegate::Wrapper_T (specialized for 8 params, void return)
template <class P0, class P1, class P2, class P3, class P4, class P5, class P6, class P7>
-class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4,P5,P6,P7)> : public ZDelegate::Wrapper
+class ZDelegate::Wrapper_T<void(P0,P1,P2,P3,P4,P5,P6,P7)>
+: public ZDelegate::Wrapper
{
friend class ZDelegate;
Modified: trunk/zoolib/source/cxx/zoolib/ZDelegate.mm
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDelegate.mm 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZDelegate.mm 2011-01-12 12:07:45 UTC (rev 1879)
@@ -59,13 +59,13 @@
return false;
}
-- (void)forwardInvocation:(NSInvocation *)anInvocation
+- (void)forwardInvocation:(NSInvocation*)anInvocation
{
if (fDelegate)
fDelegate->pForwardInvocation(anInvocation);
}
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector;
+- (NSMethodSignature*)methodSignatureForSelector:(SEL)aSelector;
{
if (fDelegate)
return fDelegate->pMethodSignatureForSelector(aSelector);
Modified: trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -837,7 +837,7 @@
if (oErr)
*oErr = ZFile::errorNone;
- if (ZFileLoc_POSIX* dest = ZRefDynamicCast<ZFileLoc_POSIX>(oDest))
+ if (ZFileLoc_POSIX* dest = oDest.DynamicCast<ZFileLoc_POSIX>())
{
if (fIsAtRoot == dest->fIsAtRoot)
return ZTrail::sTrailFromTo(fComps, dest->fComps);
@@ -1072,7 +1072,7 @@
ZRef<ZFileLoc> ZFileLoc_POSIX::MoveTo(ZRef<ZFileLoc> oDest, ZFile::Error* oErr)
{
- ZFileLoc_POSIX* other = ZRefDynamicCast<ZFileLoc_POSIX>(oDest);
+ ZFileLoc_POSIX* other = oDest.DynamicCast<ZFileLoc_POSIX>();
if (!other)
{
if (oErr)
Modified: trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -629,7 +629,7 @@
ZQ<ZTrail> ZFileLoc_Win::TrailTo(ZRef<ZFileLoc> oDest, ZFile::Error* oErr) const
{
- if (ZFileLoc_Win* dest = ZRefDynamicCast<ZFileLoc_Win>(oDest))
+ if (ZFileLoc_Win* dest = oDest.DynamicCast<ZFileLoc_Win>())
{
if (fBase == dest->fBase)
{
@@ -871,7 +871,7 @@
ZRef<ZFileLoc> ZFileLoc_Win::MoveTo(ZRef<ZFileLoc> oDest, ZFile::Error* oErr)
{
- if (ZFileLoc_Win* dest = ZRefDynamicCast<ZFileLoc_Win>(oDest))
+ if (ZFileLoc_Win* dest = oDest.DynamicCast<ZFileLoc_Win>())
{
if (::MoveFileA(this->pGetPath().c_str(), dest->pGetPath().c_str()))
return oDest;
@@ -1217,7 +1217,7 @@
ZQ<ZTrail> ZFileLoc_WinNT::TrailTo(ZRef<ZFileLoc> oDest, ZFile::Error* oErr) const
{
- if (ZFileLoc_WinNT* dest = ZRefDynamicCast<ZFileLoc_WinNT>(oDest))
+ if (ZFileLoc_WinNT* dest = oDest.DynamicCast<ZFileLoc_WinNT>())
{
if (fBase == dest->fBase)
{
@@ -1480,7 +1480,7 @@
ZRef<ZFileLoc> ZFileLoc_WinNT::MoveTo(ZRef<ZFileLoc> oDest, ZFile::Error* oErr)
{
- if (ZFileLoc_WinNT* dest = ZRefDynamicCast<ZFileLoc_WinNT>(oDest))
+ if (ZFileLoc_WinNT* dest = oDest.DynamicCast<ZFileLoc_WinNT>())
{
if (::MoveFileW(this->pGetPath().c_str(), dest->pGetPath().c_str()))
return oDest;
Modified: trunk/zoolib/source/cxx/zoolib/ZGRgnRep_BigRegion.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZGRgnRep_BigRegion.cpp 2011-01-12 12:04:39 UTC (rev 1878)
+++ trunk/zoolib/source/cxx/zoolib/ZGRgnRep_BigRegion.cpp 2011-01-12 12:07:45 UTC (rev 1879)
@@ -49,7 +49,7 @@
ZGRgnRep_BigRegion* sMakeRep(const ZRef<ZGRgnRep>& iRep)
{
- if (ZRef<ZGRgnRep_BigRegion> other = ZRefDynamicCast<ZGRgnRep_BigRegion>(iRep))
+ if (ZRef<ZGRgnRep_BigRegion> other = iRep.DynamicCast<ZGRgnRep_BigRegion>())
return new ZGRgnRep_BigRegion(other->GetBigRegion());
return sDecomposeRepIntoBigRegion(iRep);
@@ -90,7 +90,7 @@
ZRef<ZGRgnRep_BigRegion> ZGRgnRep_BigRegion::sGetRep(const ZRef<ZGRgnRep>& iRep)
{
- if (ZRef<ZGRgnRep_BigRegion> other = ZRefDynamicCas...
[truncated message content] |
