Merge pull request #1806 from Azaezel/byeByeVarVar2

more unused variable cleanups
This commit is contained in:
Anis 2016-10-23 21:04:36 +02:00 committed by GitHub
commit 60e258e5a9
31 changed files with 2 additions and 75 deletions

View file

@ -93,7 +93,6 @@ void GuiSwatchButtonCtrl::onRender( Point2I offset, const RectI &updateRect )
{
bool highlight = mMouseOver;
ColorI backColor = mSwatchColor;
ColorI borderColor = mActive ? ( highlight ? mProfile->mBorderColorHL : mProfile->mBorderColor ) : mProfile->mBorderColorNA;
RectI renderRect( offset, getExtent() );

View file

@ -381,7 +381,7 @@ bool GuiContainer::anchorControl( GuiControl *control, const Point2I &deltaParen
Point2I minExtent = control->getMinExtent();
// Only resize if our minExtent is satisfied with it.
if( !( newRect.extent.x >= control->getMinExtent().x && newRect.extent.y >= control->getMinExtent().y ) )
if( !( newRect.extent.x >= minExtent.x && newRect.extent.y >= minExtent.y ) )
return false;
if( newRect.point == oldRect.point && newRect.extent == oldRect.extent )

View file

@ -384,8 +384,6 @@ void GuiFormCtrl::onMouseUp(const GuiEvent &event)
mouseUnlock();
setUpdate();
Point2I localClick = globalToLocalCoord(event.mousePoint);
// If we're clicking in the header then resize
//if(localClick.y < mThumbSize.y && mDepressed)
// setCollapsed(!mCollapsed);

View file

@ -101,7 +101,6 @@ void GuiGradientSwatchCtrl::onRender( Point2I offset, const RectI &updateRect )
{
bool highlight = mMouseOver;
ColorI backColor = mSwatchColor;
ColorI borderColor = mActive ? ( highlight ? mProfile->mBorderColorHL : mProfile->mBorderColor ) : mProfile->mBorderColorNA;
RectI renderRect( offset, getExtent() );

View file

@ -1953,7 +1953,6 @@ void GuiMenuBar::closeSubmenu()
// Find if the mouse pointer is within a menu item
GuiMenuBar::MenuItem *GuiMenuBar::findHitMenuItem(Point2I mousePoint)
{
Point2I pos = globalToLocalCoord(mousePoint);
// for(Menu *walk = menuList; walk; walk = walk->nextMenu)
// if(walk->visible && walk->bounds.pointInRect(pos))

View file

@ -748,7 +748,6 @@ void GuiParticleGraphCtrl::onMouseDown(const GuiEvent &event)
if(event.mouseClickCount == 2)
{
Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y);
Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint);
S32 point = removePlotPoint(hitNut.x, hitNut.y);
// Argument Buffer.
@ -885,8 +884,6 @@ void GuiParticleGraphCtrl::onRightMouseDown(const GuiEvent &event)
if( hitNut != Point2I(-1,-1) )
{
Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y);
Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint);
S32 point = removePlotPoint(hitNut.x, hitNut.y);
// Argument Buffer.
@ -913,8 +910,6 @@ void GuiParticleGraphCtrl::onRightMouseDragged(const GuiEvent &event)
if( hitNut != Point2I(-1,-1) )
{
Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y);
Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint);
S32 point = removePlotPoint(hitNut.x, hitNut.y);
// Argument Buffer.

View file

@ -811,8 +811,6 @@ void Gizmo::on3DMouseDown( const Gui3DMouseEvent & event )
camPos = event.pos;
else
camPos = mCameraPos;
Point3F end = camPos + event.vec * smProjectDistance;
if ( 0 <= mSelectionIdx && mSelectionIdx <= 2 )
{

View file

@ -494,8 +494,6 @@ void GuiDecalEditorCtrl::renderScene(const RectI & updateRect)
PROFILE_SCOPE( GuiDecalEditorCtrl_renderScene );
GFXTransformSaver saver;
RectI bounds = getBounds();
ColorI hlColor(0,255,0,255);
ColorI regColor(255,0,0,255);

View file

@ -282,7 +282,6 @@ void RaiseHeightAction::process( Selection *sel, const Gui3DMouseEvent &evt, boo
return;
Point2I brushPos = brush->getPosition();
Point2I brushSize = brush->getSize();
GridPoint brushGridPoint = brush->getGridPoint();
Vector<GridInfo> cur; // the height at the brush position
@ -327,7 +326,6 @@ void LowerHeightAction::process(Selection * sel, const Gui3DMouseEvent &, bool s
return;
Point2I brushPos = brush->getPosition();
Point2I brushSize = brush->getSize();
GridPoint brushGridPoint = brush->getGridPoint();
Vector<GridInfo> cur; // the height at the brush position