Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pro4 stl changes.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@11383 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pinkerton%netscape.com
1998-09-29 17:23:55 +00:00
parent ba1aa5767d
commit e7bfd07afd
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/cmd/macfe/gui/CURLDragHelper.cp
View File

@@ -260,21 +260,21 @@ CURLDragHelper :: ExtractURLAndTitle ( DragReference inDragRef, ItemReference in
else if ( theDataSize ) {
vector<char> urlAndTitle ( theDataSize + 1 );
ThrowIfOSErr_( ::GetFlavorData( inDragRef, inItemRef, emBookmarkDrag,
urlAndTitle.begin(), &theDataSize, 0 ) );
&(*urlAndTitle.begin()), &theDataSize, 0 ) );
urlAndTitle[theDataSize] = NULL;
char* title = find(urlAndTitle.begin(), urlAndTitle.end(), '\r');
if ( title != urlAndTitle.end() ) {
char* title = &(*find(urlAndTitle.begin(), urlAndTitle.end(), '\r'));
if ( title != &(*urlAndTitle.end()) ) {
// hack up the data string into it's components
title[0] = NULL;
title++;
char* url = urlAndTitle.begin();
char* url = &(*urlAndTitle.begin());
// assign those components to the output parameters
outURL = url;
outTitle = title;
}
else {
outURL = urlAndTitle.begin();
outURL = &(*urlAndTitle.begin());
outTitle = "";
}
}
@@ -419,8 +419,8 @@ CURLDragMixin :: ReceiveDragItem ( DragReference inDragRef, DragAttributes /*inD
vector<char> textData ( theDataSize + 1 );
try {
ThrowIfOSErr_( ::GetFlavorData( inDragRef, inItemRef, 'TEXT',
textData.begin(), &theDataSize, 0 ) );
HandleDropOfText ( textData.begin() );
&(*textData.begin()), &theDataSize, 0 ) );
HandleDropOfText ( &(*textData.begin()) );
}
catch ( ... ) {
DebugStr("\pError getting flavor data for TEXT");
@@ -473,9 +473,9 @@ CURLDragMixin :: FindBestFlavor ( DragReference inDragRef, ItemReference inItemR
ItemReference mItemRef;
};
FlavorType* result = find_if ( AcceptedFlavors().begin(), AcceptedFlavors().end(),
FindBestFlavor_imp(inDragRef, inItemRef) );
if ( result != AcceptedFlavors().end() ) {
FlavorType* result = &(* find_if ( AcceptedFlavors().begin(), AcceptedFlavors().end(),
FindBestFlavor_imp(inDragRef, inItemRef) ) );
if ( result != &(*AcceptedFlavors().end()) ) {
oFlavor = *result;
return true;
}

2
mozilla/cmd/macfe/rdfui/CHyperTreeHeader.cp
View File

@@ -117,7 +117,7 @@ CHyperTreeHeader::SetUpColumns ( HT_View inView )
while (iter != dataVector.end())
{
Int32 byteCount = sizeof(LTableHeader::SColumnData);
dataStream.PutBytes(iter, byteCount);
dataStream.PutBytes(&(*iter), byteCount);
++iter;
}
if (mColumnData)