Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[2707] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2012-02-01 18:21:08
|
Revision: 2707
http://zoolib.svn.sourceforge.net/zoolib/?rev=2707&view=rev
Author: agreen
Date: 2012-02-01 18:21:01 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Fix some //## mistakes that came from moving away from #\t stuff.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -275,7 +275,7 @@
ZAssert(!req);
fOpen = false;
-//# #ZStreamerWriter::Wake();
+//## ZStreamerWriter::Wake();
return false;
}
@@ -306,7 +306,7 @@
void Device_Client::Stop()
{
fOpen = false;
-//# #ZStreamerWriter::Wake();
+//## ZStreamerWriter::Wake();
}
// =================================================================================================
@@ -347,7 +347,7 @@
fSendClose = true;
this->WakeWrite();
-//# #ZCommer::ReadFinished();
+//## ZCommer::ReadFinished();
}
bool Manager_Client::Commer_Changed::Read(const ZStreamR& r)
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -367,8 +367,8 @@
// Watcher fired, but could not create a USBDevice.
if (ZLOG(s, eNotice, "ZBlackBerry::Manager_OSXUSB"))
s << "Added, invoked with null device, PocketMac drivers installed?";
-//# #if (fPocketMacDriverInstalled)
-//# #fObserver->AddFailed();
+//## if (fPocketMacDriverInstalled)
+//## fObserver->AddFailed();
return;
}
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -278,7 +278,7 @@
s << "\nDatonSet Raw:\n" << iAdded->GetRel();
ZRef<ZRA::Expr_Rel> theRel = iAdded->GetRel();
-//# #theRel = ZQE::sTransform_Search(theRel);
+//## theRel = ZQE::sTransform_Search(theRel);
if (ZLOGPF(s, eDebug + 1))
s << "\nDatonSet Cooked:\n" << theRel;
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -461,7 +461,7 @@
#elif defined(__PIWin__)
// Need to look at this again when we're doing 64 bit compiles.
-//# #ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
+//## ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
UseHandle useHandle(fHandle);
size_t handleSize = useHandle.Size();
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -364,7 +364,7 @@
TypeID theType;
if (noErr != spPSActionList->GetType(iSource, x, &theType))
break;
-//# #COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
+//## COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
}
}
return theDest;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 18:21:01 UTC (rev 2707)
@@ -52,7 +52,7 @@
virtual ZRef<ZNodeRep> CreateDir(Error* oError);
virtual ZRef<ZNodeRep> MoveTo(ZRef<ZNodeRep> iDest, Error* oError);
-//# #virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
+//## virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
virtual bool Delete(Error* oError);
virtual ZRef<ZStreamerR> OpenR(bool iPreventWriters, Error* oError);
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -587,8 +587,8 @@
if (inColorPixmap)
sAddPixmapToIconFamily(inColorPixmap, eData8, theIconFamilyHandle);
-//# #if (inColorPixmap)
-//# #sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
+//## if (inColorPixmap)
+//## sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
if (inMonoPixmap)
sAddPixmapToIconFamily(inMonoPixmap, eData1, theIconFamilyHandle);
@@ -635,7 +635,7 @@
/* if (ZApp::sGet())
{
ZDCRgn theDCRgn;
-//# #ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
+//## ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
::MacCopyRgn(theDCRgn, *outMouseRgn);
}*/
return false;
@@ -671,8 +671,8 @@
static ModalFilterUPP sModalFilterUPP = NewModalFilterUPP(ZUtil_Mac_HL::sModalFilter);
pascal Boolean ZUtil_Mac_HL::sModalFilter(DialogPtr theDialog, EventRecord* inOutEventRecord, short* inOutItemHit)
{
-//# #if (ZApp::sGet())
-//# #return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
+//## if (ZApp::sGet())
+//## return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
return false;
}
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -76,7 +76,7 @@
"Vector",
"Type",
"Time",
-//# #"Name"
+//## "Name"
};
const char* ZTypeAsString(ZType iType)
@@ -1486,7 +1486,7 @@
case eZType_Rect: delete fData.fAs_Rect; break;
case eZType_String: sDtor_T<ValString>(fType.fBytes); break;
-//# #case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
+//## case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
case eZType_Tuple: sDtor_T<ZMap_ZooLib>(fType.fBytes); break;
case eZType_RefCounted:
{
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 18:21:01 UTC (rev 2707)
@@ -82,7 +82,7 @@
eZType_Vector = 18,
eZType_Type = 19,
eZType_Time = 20,
-//# #eZType_Name = 21
+//## eZType_Name = 21
eZType_Max
};
Modified: trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -165,7 +165,7 @@
else if (typeValueLC == "id") oVal = eZType_ID;
else if (typeValueLC == "vector") oVal = eZType_Vector;
else if (typeValueLC == "type") oVal = eZType_Type;
-//# #else if (typeValueLC == "name") oVal = eZType_Name;
+//## else if (typeValueLC == "name") oVal = eZType_Name;
else
spThrowParseException("Unknown type name '" + typeValue + "'");
}
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -29,9 +29,6 @@
ZAny ZVal_Yad::AsAny() const
{ return this->pAsAny(); }
-//##ZVal_Yad::operator operator_bool() const
-//# #{ return operator_bool_gen::translate(fYad); }
-
ZVal_Yad::ZVal_Yad()
{}
Modified: trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -78,7 +78,7 @@
}
//##ZRef<ZYadSeqRPos> ZYadSeqRPos_ApplyID::Clone()
-//# #{ return new ZYadSeqRPos_ApplyID(fYadSeqRPos->Clone(), fIDName, fValName); }
+///## { return new ZYadSeqRPos_ApplyID(fYadSeqRPos->Clone(), fIDName, fValName); }
uint64 ZYadSeqRPos_ApplyID::GetPosition()
{ return fYadSeqRPos->GetPosition(); }
Modified: trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h 2012-02-01 18:21:01 UTC (rev 2707)
@@ -62,7 +62,7 @@
virtual ZRef<ZYadR> ReadInc();
// From ZYadSeqRPos
-//# #virtual ZRef<ZYadSeqRPos> Clone();
+//## virtual ZRef<ZYadSeqRPos> Clone();
virtual uint64 GetPosition();
virtual void SetPosition(uint64 iPosition);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
