Skip to content

Remove deprecated code in preparation for Coin 5. #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
veelo wants to merge 1 commit into
base: coin-5
Choose a base branch
from
Open

Remove deprecated code in preparation for Coin 5. #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions include/Inventor/SoInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ class COIN_DLL_API SoInput {
virtual SbBool get(char & c);
virtual SbBool getASCIIBuffer(char & c);
virtual SbBool getASCIIFile(char & c);
virtual SbBool readHex(uint32_t & l);
virtual SbBool read(char & c);
virtual SbBool read(char & c, SbBool skip);
virtual SbBool read(SbString & s);
Expand Down Expand Up @@ -165,9 +164,6 @@ class COIN_DLL_API SoInput {
SbBool readInteger(int32_t & l);
SbBool readUnsignedInteger(uint32_t & l);
SbBool readReal(double & d);
SbBool readUnsignedIntegerString(char * str);
int readDigits(char * str);
int readHexDigits(char * str);
int readChar(char * str, char charToRead);

SbBool makeRoomInBuf(size_t nBytes);
Expand Down
2 changes: 0 additions & 2 deletions include/Inventor/SoRenderManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,7 @@ class COIN_DLL_API SoRenderManager {

private:
void attachRootSensor(SoNode * const sceneroot);
void attachClipSensor(SoNode * const sceneroot);
void detachRootSensor(void);
void detachClipSensor(void);
static void nodesensorCB(void * data, SoSensor *);
static void prerendercb(void * userdata, SoGLRenderAction * action);

Expand Down
38 changes: 0 additions & 38 deletions include/Inventor/elements/SoGLTexture3EnabledElement.h
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions include/Inventor/elements/SoTexture3EnabledElement.h
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions src/io/SoInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,37 +859,6 @@ SoInput::getASCIIFile(char & c)
return this->get(c);
}

/*!
Reads an unsigned integer in hexadecimal format from the current stream.
Note that no error checking is done to see if it actually is a hex
format value.

A number in hexadecimal format must have the "0x" prefix.

Returns \c FALSE if end of file is encountered.
*/
SbBool
SoInput::readHex(uint32_t & l)
{
assert(!this->isBinary());

// FIXME: this is a tremendously stupid function. Should obsolete it.

// FIXME: no checking for array overwriting. Dangerous. 19990625 mortene.
char buffer[1024];
char * bufptr = buffer;

if (this->readChar(bufptr, '0')) {
if (this->readChar(bufptr + 1, 'x')) {
bufptr += 2 + this->readHexDigits(bufptr + 2);
}
}

*bufptr = '\0';
sscanf(buffer, "%x", &l);
return TRUE;
}

/*!
Skips whitespace and reads next character in input stream.
Returns \c FALSE if encountering end of file.
Expand Down Expand Up @@ -2243,51 +2212,6 @@ SoInput::readReal(double & d)
return fi->readReal(d);
}

/*!
Reads a set of bytes from the stream making up an unsigned integer and
puts them at \a str.

Returns \c FALSE if no string representing an unsigned integer could be
read.

\deprecated Will not be available in Coin 5 due to absence of bounds checking.
*/
SbBool
SoInput::readUnsignedIntegerString(char * str)
{
SoInput_FileInfo * fi = PRIVATE(this)->getTopOfStackPopOnEOF();
if (!fi) return FALSE;
return fi->readUnsignedIntegerString(str);
}

/*!
Read decimal base digits from the current input stream into \a str and
returns the number of characters read.

\deprecated Will not be available in Coin 5 due to absence of bounds checking.
*/
int
SoInput::readDigits(char * str)
{
SoInput_FileInfo * fi = PRIVATE(this)->getTopOfStackPopOnEOF();
if (!fi) return FALSE;
return fi->readDigits(str);
}

/*!
Read hexadecimal base digits from the current input stream into \a str and
returns the number of characters read.

\deprecated Will not be available in Coin 5 due to absence of bounds checking.
*/
int
SoInput::readHexDigits(char * str)
{
SoInput_FileInfo * fi = PRIVATE(this)->getTopOfStackPopOnEOF();
if (!fi) return FALSE;
return fi->readHexDigits(str);
}

/*!
Reads the next character in stream and compares it to \a charToRead.
Returns \c 1 on success, \c 0 on failure. Failure may come from either
Expand Down
69 changes: 0 additions & 69 deletions src/io/SoInput_FileInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,34 +517,6 @@ SoInput_FileInfo::readUnsignedIntegerString()
return TRUE;
}

/*!
\deprecated Will not be available in Coin 5 due to absence of bounds checking.
*/
SbBool
SoInput_FileInfo::readUnsignedIntegerString(char * str)
{
assert(!this->isBinary());
int minSize = 1;
char * s = str;

if (this->readChar(s, '0')) {
if (this->readChar(s + 1, 'x')) {
s += 2 + this->readHexDigits(s + 2);
minSize = 3;
}
else
s += 1 + this->readDigits(s + 1);
}
else
s += this->readDigits(s);

if (s - str < minSize)
return FALSE;

*s = '\0';
return TRUE;
}

SbBool
SoInput_FileInfo::readUnsignedInteger(uint32_t & l)
{
Expand Down Expand Up @@ -735,27 +707,6 @@ SoInput_FileInfo::readDigits()
return (int)offset;
}

/*!
\deprecated Will not be available in Coin 5 due to absence of bounds checking.
*/
int
SoInput_FileInfo::readDigits(char * str)
{
assert(!this->isBinary());
char c, * s = str;

while (this->get(c)) {
if (isdigit(c))
*s++ = c;
else {
this->putBack(c);
break;
}
}
const ptrdiff_t offset = s - str;
return (int)offset;
}

int
SoInput_FileInfo::readHexDigits()
{
Expand All @@ -774,23 +725,3 @@ SoInput_FileInfo::readHexDigits()
const ptrdiff_t offset = readString.length() - oldLength;
return (int)offset;
}

/*!
\deprecated Will not be available in Coin 5 due to absence of bounds checking.
*/
int
SoInput_FileInfo::readHexDigits(char * str)
{
assert(!this->isBinary());
char c, * s = str;
while (this->get(c)) {

if (isxdigit(c)) *s++ = c;
else {
this->putBack(c);
break;
}
}
const ptrdiff_t offset = s - str;
return (int)offset;
}
6 changes: 0 additions & 6 deletions src/io/SoInput_FileInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,7 @@ class SoInput_FileInfo {
void connectRoutes(SoInput * in);
void unrefProtos(void);
int readChar(char * s, char charToRead);
COIN_DEPRECATED("Unsafe, will be removed from Coin 5")
int readDigits(char * str);
COIN_DEPRECATED("Unsafe, will be removed from Coin 5")
int readHexDigits(char * str);

COIN_DEPRECATED("Unsafe, will be removed from Coin 5")
SbBool readUnsignedIntegerString(char * str);
SbBool readUnsignedInteger(uint32_t & l);
SbBool readInteger(int32_t & l);
SbBool readReal(double & d);
Expand Down
42 changes: 0 additions & 42 deletions src/rendering/SoRenderManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ SoRenderManager::~SoRenderManager()
void
SoRenderManager::setSceneGraph(SoNode * const sceneroot)
{
//this->detachClipSensor();
this->detachRootSensor();
// Don't unref() until after we've set up the new root, in case the
// old root == the new sceneroot. (Just to be that bit more robust.)
Expand All @@ -344,7 +343,6 @@ SoRenderManager::setSceneGraph(SoNode * const sceneroot)
if (PRIVATE(this)->scene) {
PRIVATE(this)->scene->ref();
this->attachRootSensor(PRIVATE(this)->scene);
//this->attachClipSensor(PRIVATE(this)->scene);
}

if (oldroot) oldroot->unref();
Expand Down Expand Up @@ -388,8 +386,6 @@ SoRenderManager::getCamera(void) const
Internal callback

\param[in] data Pointer to SoRenderManager

\deprecated Will be made private in a later version of Coin
*/
void
SoRenderManager::nodesensorCB(void * data, SoSensor * /* sensor */)
Expand All @@ -405,8 +401,6 @@ SoRenderManager::nodesensorCB(void * data, SoSensor * /* sensor */)
Attaches this SoRenderManagers root sensor to a scene

\param[in] sceneroot scene to attach to

\deprecated Will be private available in Coin 4
*/
void
SoRenderManager::attachRootSensor(SoNode * const sceneroot)
Expand All @@ -427,8 +421,6 @@ SoRenderManager::attachRootSensor(SoNode * const sceneroot)

/*
Detaches the rootsensor from all tracked scenes

\deprecated Will not be available in Coin 4
*/
void
SoRenderManager::detachRootSensor(void)
Expand All @@ -438,38 +430,6 @@ SoRenderManager::detachRootSensor(void)
}
}

/*
Attaches this SoRenderManagers clipsensor to a scene

\param[in] sceneroot scene to attach to

\deprecated Will not be available in Coin 5
*/
void
SoRenderManager::attachClipSensor(SoNode * const sceneroot)
{
//PRIVATE(this)->clipsensor->attach(sceneroot);
//if (PRIVATE(this)->autoclipping != SoRenderManager::NO_AUTO_CLIPPING) {
// PRIVATE(this)->clipsensor->schedule();
//}
}

/*
Detaches the clipsensor from all tracked scenes

\deprecated Will not be available in Coin 5
*/
void
SoRenderManager::detachClipSensor(void)
{
//if (PRIVATE(this)->clipsensor->isScheduled()) {
// PRIVATE(this)->clipsensor->unschedule();
//}
//if (PRIVATE(this)->clipsensor->getAttachedNode()) {
// PRIVATE(this)->clipsensor->detach();
//}
}

/*!
Clears buffers with the background color set correctly

Expand All @@ -492,8 +452,6 @@ SoRenderManager::clearBuffers(SbBool color, SbBool depth)

\param[in] userdata GLbitfield mask
\param[in] action Calling action

\deprecated Will be made private in a later version of Coin
*/
void
SoRenderManager::prerendercb(void * userdata, SoGLRenderAction * action)
Expand Down
Loading