livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-493 LLUrlWhiteList to LLSingleton

meow-7.2.2
andreykproductengine 2019-07-04 18:07:46 +03:00
parent 779b5627c5
commit 56715de2cf
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llurlwhitelist.cpp
View File

@ -31,8 +31,6 @@
#include <iostream>
#include <fstream>
LLUrlWhiteList* LLUrlWhiteList::sInstance = 0;
///////////////////////////////////////////////////////////////////////////////
//
LLUrlWhiteList::LLUrlWhiteList () :
@ -49,29 +47,6 @@ LLUrlWhiteList::~LLUrlWhiteList ()
{
}
///////////////////////////////////////////////////////////////////////////////
//static
void LLUrlWhiteList::initClass ()
{
if ( ! sInstance )
{
sInstance = new LLUrlWhiteList ();
}
}
//static
void LLUrlWhiteList::cleanupClass ()
{
delete sInstance;
sInstance = NULL;
}
LLUrlWhiteList* LLUrlWhiteList::getInstance ()
{
return sInstance;
}
///////////////////////////////////////////////////////////////////////////////
//
bool LLUrlWhiteList::load ()

13
indra/newview/llurlwhitelist.h
View File

@ -30,15 +30,11 @@
#include <list>
class LLUrlWhiteList
class LLUrlWhiteList : public LLSingleton<LLUrlWhiteList>
{
LLSINGLETON(LLUrlWhiteList);
~LLUrlWhiteList();
public:
virtual ~LLUrlWhiteList ();
static void initClass();
static void cleanupClass();
static LLUrlWhiteList* getInstance ();
bool load ();
bool save ();
@ -51,9 +47,6 @@ class LLUrlWhiteList
bool getNext ( std::string& valueOut );
private:
LLUrlWhiteList ();
static LLUrlWhiteList* sInstance;
typedef std::vector < std::string > string_list_t ;
bool mLoaded;