Remove dead code
This commit is contained in:
@@ -30,7 +30,6 @@ set(llui_SOURCE_FILES
|
||||
llclipboard.cpp
|
||||
llcombobox.cpp
|
||||
llctrlselectioninterface.cpp
|
||||
lldelayeduidelete.cpp
|
||||
lldraghandle.cpp
|
||||
lleditmenuhandler.cpp
|
||||
llfloater.cpp
|
||||
@@ -90,7 +89,6 @@ set(llui_HEADER_FILES
|
||||
llclipboard.h
|
||||
llcombobox.h
|
||||
llctrlselectioninterface.h
|
||||
lldelayeduidelete.h
|
||||
lldraghandle.h
|
||||
lleditmenuhandler.h
|
||||
llfloater.h
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
// <edit>
|
||||
#include "linden_common.h"
|
||||
#include "lldelayeduidelete.h"
|
||||
#define DELETE_DELAY 0.1f
|
||||
#define DELETES_PER_DELAY 512
|
||||
|
||||
LLDeleteScheduler* gDeleteScheduler;
|
||||
|
||||
std::list<LLDeleteJob*> LLDeleteScheduler::sJobs;
|
||||
LLDeleteScheduler::LLDeleteScheduler() : LLEventTimer(DELETE_DELAY)
|
||||
{
|
||||
}
|
||||
void LLDeleteScheduler::addViewDeleteJob(std::list<LLView*> views)
|
||||
{
|
||||
if(!views.empty())
|
||||
{
|
||||
LLViewDeleteJob* job = new LLViewDeleteJob(views);
|
||||
sJobs.push_back(job);
|
||||
}
|
||||
}
|
||||
BOOL LLDeleteScheduler::tick() // IMPORTANT: never return TRUE
|
||||
{
|
||||
if(!sJobs.empty())
|
||||
{
|
||||
U32 completed = 0;
|
||||
do
|
||||
{
|
||||
LLDeleteJob* job = sJobs.front();
|
||||
if(job->work(completed))
|
||||
{
|
||||
delete job;
|
||||
sJobs.pop_front();
|
||||
}
|
||||
} while((completed < DELETES_PER_DELAY) && !sJobs.empty());
|
||||
}
|
||||
return FALSE; // EVER
|
||||
}
|
||||
BOOL LLDeleteJob::work(U32& completed)
|
||||
{
|
||||
llwarns << "THIS IS SPOSED TO BE OVERRIDDEN" << llendl;
|
||||
return TRUE;
|
||||
}
|
||||
LLViewDeleteJob::LLViewDeleteJob(std::list<LLView*> views)
|
||||
: mList(views)
|
||||
{
|
||||
}
|
||||
LLViewDeleteJob::~LLViewDeleteJob()
|
||||
{
|
||||
}
|
||||
BOOL LLViewDeleteJob::work(U32& completed)
|
||||
{
|
||||
do
|
||||
{
|
||||
if(!mList.empty())
|
||||
{
|
||||
LLView* view = mList.front();
|
||||
delete view;
|
||||
mList.pop_front();
|
||||
}
|
||||
else
|
||||
{
|
||||
return TRUE; // job done
|
||||
}
|
||||
} while(++completed < DELETES_PER_DELAY);
|
||||
return FALSE;
|
||||
}
|
||||
// </edit>
|
||||
@@ -1,32 +0,0 @@
|
||||
// <edit>
|
||||
#ifndef LL_LLDELAYEDUIDELETE_H
|
||||
#define LL_LLDELAYEDUIDELETE_H
|
||||
#include "lleventtimer.h"
|
||||
#include "llview.h"
|
||||
class LLDeleteJob
|
||||
{
|
||||
public:
|
||||
virtual BOOL work(U32& completed);
|
||||
virtual ~LLDeleteJob() {}
|
||||
};
|
||||
class LLViewDeleteJob : public LLDeleteJob
|
||||
{
|
||||
public:
|
||||
LLViewDeleteJob(std::list<LLView*> views);
|
||||
virtual ~LLViewDeleteJob();
|
||||
virtual BOOL work(U32& completed);
|
||||
private:
|
||||
std::list<LLView*> mList;
|
||||
};
|
||||
class LLDeleteScheduler : public LLEventTimer
|
||||
{
|
||||
public:
|
||||
LLDeleteScheduler();
|
||||
void addViewDeleteJob(std::list<LLView*> views);
|
||||
BOOL tick();
|
||||
private:
|
||||
static std::list<LLDeleteJob*> sJobs;
|
||||
};
|
||||
extern LLDeleteScheduler* gDeleteScheduler;
|
||||
#endif
|
||||
// </edit>
|
||||
@@ -59,10 +59,6 @@
|
||||
#include "lltextbox.h"
|
||||
#include "llfasttimer.h"
|
||||
|
||||
// <edit>
|
||||
#include "lldelayeduidelete.h"
|
||||
// </edit>
|
||||
|
||||
using namespace LLOldEvents;
|
||||
|
||||
//HACK: this allows you to instantiate LLView from xml with "<view/>" which we don't want
|
||||
|
||||
Reference in New Issue
Block a user