TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-27 16:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced StringTable->insert("") with StringTable->EmptyString()

Browse source
This commit is contained in:
Thomas "elfprince13" Dickerson 2017-01-11 23:21:29 -05:00
parent bcc5459818
commit 27e2871b01
33 changed files with 304 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gui/buttons/guiIconButtonCtrl.cpp
View file

@ -85,7 +85,7 @@ ConsoleDocClass( GuiIconButtonCtrl,
GuiIconButtonCtrl::GuiIconButtonCtrl()
{
mBitmapName = StringTable->insert("");
mBitmapName = StringTable->EmptyString();
mTextLocation = TextLocLeft;
mIconLocation = IconLocLeft;
mTextMargin = 4;
@ -94,7 +94,7 @@ GuiIconButtonCtrl::GuiIconButtonCtrl()
mFitBitmapToButton = false;
mMakeIconSquare = false;
mErrorBitmapName = StringTable->insert("");
mErrorBitmapName = StringTable->EmptyString();
mErrorTextureHandle = NULL;
mAutoSize = false;

2
Engine/source/gui/buttons/guiToggleButtonCtrl.cpp
View file

@ -49,7 +49,7 @@ ConsoleDocClass( GuiToggleButtonCtrl,
GuiToggleButtonCtrl::GuiToggleButtonCtrl()
{
setExtent(140, 30);
mButtonText = StringTable->insert("");
mButtonText = StringTable->EmptyString();
mStateOn = false;
mButtonType = ButtonTypeCheck;
}

4
Engine/source/gui/buttons/guiToolboxButtonCtrl.cpp
View file

@ -43,7 +43,7 @@ ConsoleDocClass( GuiToolboxButtonCtrl,
//-------------------------------------
GuiToolboxButtonCtrl::GuiToolboxButtonCtrl()
{
mNormalBitmapName = StringTable->insert("");
mNormalBitmapName = StringTable->EmptyString();
mLoweredBitmapName = StringTable->insert("sceneeditor/client/images/buttondown");
mHoverBitmapName = StringTable->insert("sceneeditor/client/images/buttonup");
setMinExtent(Point2I(16,16));
@ -225,4 +225,4 @@ void GuiToolboxButtonCtrl::renderButton(GFXTexHandle &texture, Point2I &offset,
GFX->getDrawUtil()->drawBitmap(texture, finalOffset);
renderChildControls( offset, updateRect);
}
}
}

6
Engine/source/gui/containers/guiFormCtrl.cpp
View file

@ -50,8 +50,8 @@ GuiFormCtrl::GuiFormCtrl()
mCaption = "[none]";
mUseSmallCaption = false;
mContentLibrary = StringTable->insert("");
mContent = StringTable->insert("");
mContentLibrary = StringTable->EmptyString();
mContent = StringTable->EmptyString();
mCanSaveFieldDictionary = true;
mIsContainer = true;
@ -213,7 +213,7 @@ bool GuiFormCtrl::resize(const Point2I &newPosition, const Point2I &newExtent)
static char buf[256];
mUseSmallCaption = true;
mSmallCaption = StringTable->insert("");
mSmallCaption = StringTable->EmptyString();
S32 strlen = dStrlen((const char*)mCaption);
for(S32 i=strlen; i>=0; --i)

2
Engine/source/gui/containers/guiPaneCtrl.cpp
View file

@ -68,7 +68,7 @@ GuiPaneControl::GuiPaneControl()
mMouseOver = false;
mDepressed = false;
mCaption = "A Pane";
mCaptionID = StringTable->insert("");
mCaptionID = StringTable->EmptyString();
mIsContainer = true;
mOriginalExtents.set(10,10);

2
Engine/source/gui/containers/guiWindowCtrl.cpp
View file

@ -1512,7 +1512,7 @@ void GuiWindowCtrl::setCloseCommand(const char *newCmd)
if (newCmd)
mCloseCommand = StringTable->insert(newCmd);
else
mCloseCommand = StringTable->insert("");
mCloseCommand = StringTable->EmptyString();
}
//-----------------------------------------------------------------------------

4
Engine/source/gui/controls/guiGameListMenuCtrl.cpp
View file

@ -38,7 +38,7 @@ GuiGameListMenuCtrl::GuiGameListMenuCtrl()
VECTOR_SET_ASSOCIATION(mRows);
// initialize the control callbacks
mCallbackOnA = StringTable->insert("");
mCallbackOnA = StringTable->EmptyString();
mCallbackOnB = mCallbackOnA;
mCallbackOnX = mCallbackOnA;
mCallbackOnY = mCallbackOnA;
@ -572,7 +572,7 @@ StringTableEntry GuiGameListMenuCtrl::getRowLabel(S32 rowIndex) const
if (! isValidRowIndex(rowIndex))
{
// not a valid row index, don't do anything
return StringTable->insert("");
return StringTable->EmptyString();
}
return mRows[rowIndex]->mLabel;
}

4
Engine/source/gui/controls/guiListBoxCtrl.cpp
View file

@ -1530,7 +1530,7 @@ void GuiListBoxCtrl::_mirror()
StringTableEntry GuiListBoxCtrl::_makeMirrorItemName( SimObject *inObj )
{
StringTableEntry outName = StringTable->insert("");
StringTableEntry outName = StringTable->EmptyString();
if ( mMakeNameCallback.isNotEmpty() )
{
@ -1634,4 +1634,4 @@ void GuiListBoxCtrl::removeFilteredItem( String item )
break;
}
}
}
}

4
Engine/source/gui/controls/guiMLTextCtrl.cpp
View file

@ -251,7 +251,7 @@ GuiMLTextCtrl::GuiMLTextCtrl()
mIsEditCtrl( false ),
mCursorPosition( false ),
mMaxBufferSize( -1 ),
mInitialText( StringTable->insert("") ),
mInitialText( StringTable->EmptyString() ),
mSelectionActive( false ),
mSelectionStart( 0 ),
mSelectionEnd( 0 ),
@ -267,7 +267,7 @@ GuiMLTextCtrl::GuiMLTextCtrl()
mFontList( NULL )
{
mActive = true;
//mInitialText = StringTable->insert("");
//mInitialText = StringTable->EmptyString();
Sim::findObject("InputDeniedSound", mDeniedSound);
}

2
Engine/source/gui/controls/guiPopUpCtrl.cpp
View file

@ -277,7 +277,7 @@ GuiPopUpMenuCtrl::GuiPopUpMenuCtrl(void)
mRenderScrollInNA = false; // Added
mBackgroundCancel = false; // Added
mReverseTextList = false; // Added - Don't reverse text list if displaying up
mBitmapName = StringTable->insert(""); // Added
mBitmapName = StringTable->EmptyString(); // Added
mBitmapBounds.set(16, 16); // Added
mIdMax = -1;
}

2
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -328,7 +328,7 @@ GuiPopUpMenuCtrlEx::GuiPopUpMenuCtrlEx(void)
mRenderScrollInNA = false; // Added
mBackgroundCancel = false; // Added
mReverseTextList = false; // Added - Don't reverse text list if displaying up
mBitmapName = StringTable->insert(""); // Added
mBitmapName = StringTable->EmptyString(); // Added
mBitmapBounds.set(16, 16); // Added
mHotTrackItems = false;
mIdMax = -1;

4
Engine/source/gui/controls/guiTextCtrl.cpp
View file

@ -54,8 +54,8 @@ ConsoleDocClass( GuiTextCtrl,
GuiTextCtrl::GuiTextCtrl()
{
//default fonts
mInitialText = StringTable->insert("");
mInitialTextID = StringTable->insert("");
mInitialText = StringTable->EmptyString();
mInitialTextID = StringTable->EmptyString();
mText[0] = '\0';
mMaxStrLen = GuiTextCtrl::MAX_STRING_LENGTH;
}

2
Engine/source/gui/controls/guiTextEditCtrl.cpp
View file

@ -1684,7 +1684,7 @@ DefineEngineMethod( GuiTextEditCtrl, getText, const char*, (),,
"@see GuiControl")
{
if( !object->hasText() )
return StringTable->insert("");
return StringTable->EmptyString();
char *retBuffer = Con::getReturnBuffer( GuiTextEditCtrl::MAX_STRING_LENGTH );
object->getText( retBuffer );

6
Engine/source/gui/controls/guiTreeViewCtrl.cpp
View file

@ -845,7 +845,7 @@ GuiTreeViewCtrl::GuiTreeViewCtrl()
mClearAllOnSingleSelection = true;
mBitmapBase = StringTable->insert("");
mBitmapBase = StringTable->EmptyString();
mTexRollover = NULL;
mTexSelected = NULL;
@ -4746,13 +4746,13 @@ StringTableEntry GuiTreeViewCtrl::getTextToRoot( S32 itemId, const char * delimi
if(!item)
{
Con::errorf(ConsoleLogEntry::General, "GuiTreeViewCtrl::getTextToRoot: invalid start item id!");
return StringTable->insert("");
return StringTable->EmptyString();
}
if(item->isInspectorData())
{
Con::errorf(ConsoleLogEntry::General, "GuiTreeViewCtrl::getTextToRoot: cannot get text to root of inspector data items");
return StringTable->insert("");
return StringTable->EmptyString();
}
char bufferOne[1024];

2
Engine/source/gui/editor/guiParticleGraphCtrl.cpp
View file

@ -50,7 +50,7 @@ GuiParticleGraphCtrl::GuiParticleGraphCtrl()
mPlots[i].mGraphMin.x = 0;
mPlots[i].mGraphMin.y = 0;
mPlots[i].mGraphType = Polyline;
mPlots[i].mGraphName = StringTable->insert("");
mPlots[i].mGraphName = StringTable->EmptyString();
mPlots[i].mHidden = false;
mPlots[i].mGraphScale = 0.05f;
}

2
Engine/source/gui/game/guiChunkedBitmapCtrl.cpp
View file

@ -86,7 +86,7 @@ DefineEngineMethod( GuiChunkedBitmapCtrl, setBitmap, void, (const char* filename
GuiChunkedBitmapCtrl::GuiChunkedBitmapCtrl()
{
mBitmapName = StringTable->insert("");
mBitmapName = StringTable->EmptyString();
mUseVariable = false;
mTile = false;
}

10
Engine/source/gui/worldEditor/undoActions.cpp
View file

@ -218,8 +218,8 @@ InspectorFieldUndoAction::InspectorFieldUndoAction()
{
mObjId = 0;
mField = NULL;
mSlotName = StringTable->insert("");
mArrayIdx = StringTable->insert("");
mSlotName = StringTable->EmptyString();
mArrayIdx = StringTable->EmptyString();
}
InspectorFieldUndoAction::InspectorFieldUndoAction( const UTF8 *actionName )
@ -228,8 +228,8 @@ InspectorFieldUndoAction::InspectorFieldUndoAction( const UTF8 *actionName )
mInspector = NULL;
mObjId = 0;
mField = NULL;
mSlotName = StringTable->insert("");
mArrayIdx = StringTable->insert("");
mSlotName = StringTable->EmptyString();
mArrayIdx = StringTable->EmptyString();
}
void InspectorFieldUndoAction::initPersistFields()
@ -272,4 +272,4 @@ void InspectorFieldUndoAction::undo()
// Now save the previous data in this UndoAction
// since an undo action must become a redo action and vice-versa
mData = data;
}
}