summaryrefslogtreecommitdiff
path: root/rsc/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:21:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:34 +0100
commit5bbdb9423e15b68438bb8397c15635e044129e28 (patch)
tree737406d1586cdd8b5247f7f230ab59bf0bb87bbb /rsc/inc
parente96bf3c40f945d15a8bdc9cffc27346dfb3cb246 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I8df6c1c7d2312a4864750180561a3e63fe37003f
Diffstat (limited to 'rsc/inc')
-rw-r--r--rsc/inc/rscclass.hxx2
-rw-r--r--rsc/inc/rsccont.hxx10
-rw-r--r--rsc/inc/rscdef.hxx2
-rw-r--r--rsc/inc/rsclex.hxx6
-rw-r--r--rsc/inc/rsctop.hxx6
5 files changed, 13 insertions, 13 deletions
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index fb240d073931..d6a5b4836499 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -70,7 +70,7 @@ public:
RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
bool bInitDflt = false,
- RscTop * pCreateClass = NULL ) override;
+ RscTop * pCreateClass = nullptr ) override;
RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ) override;
// gives the class size in bytes
diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index e6095c36f9a6..cd1deaa595e4 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.hxx
@@ -55,11 +55,11 @@ protected:
RscTypCont * pTC, sal_uInt32, bool bExtra );
public:
RscBaseCont( Atom nId, sal_uInt32 nTypId,
- RscTop * pSuper = NULL,
+ RscTop * pSuper = nullptr,
bool bNoId = true );
virtual ~RscBaseCont();
virtual RSCCLASS_TYPE GetClassType() const override;
- void SetTypeClass( RscTop * pClass, RscTop * pClass1 = NULL )
+ void SetTypeClass( RscTop * pClass, RscTop * pClass1 = nullptr )
{
pTypeClass = pClass;
pTypeClass1 = pClass1;
@@ -107,7 +107,7 @@ class RscContWriteSrc : public RscBaseCont
{
public:
RscContWriteSrc( Atom nId, sal_uInt32 nTypId,
- RscTop * pSuper = NULL,
+ RscTop * pSuper = nullptr,
bool bNoId = true );
void WriteSrc( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const char * ) override;
@@ -117,7 +117,7 @@ class RscCont : public RscContWriteSrc
{
public:
RscCont( Atom nId, sal_uInt32 nTypId,
- RscTop * pSuper = NULL,
+ RscTop * pSuper = nullptr,
bool bNoId = true );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
@@ -127,7 +127,7 @@ class RscContExtraData : public RscContWriteSrc
{
public:
RscContExtraData( Atom nId, sal_uInt32 nTypId,
- RscTop * pSuper = NULL,
+ RscTop * pSuper = nullptr,
bool bNoId = true );
ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem,
RscTypCont * pTC, sal_uInt32, bool bExtra ) override;
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 2f8b69c0dbfc..60ce424e636b 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -228,7 +228,7 @@ class RscDefTree
RscDefine * pDefRoot;
public:
static bool Evaluate( RscDefine * pDef );
- RscDefTree(){ pDefRoot = NULL; }
+ RscDefTree(){ pDefRoot = nullptr; }
~RscDefTree();
void Remove();
RscDefine * Search( const char * pName );
diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx
index 6d6fc43a5c3a..f3406f76bb5d 100644
--- a/rsc/inc/rsclex.hxx
+++ b/rsc/inc/rsclex.hxx
@@ -60,7 +60,7 @@ struct Node
Node* pPrev;
RSCINST aInst;
sal_uInt32 nTupelRec; // Rekursionstiefe fuer Tupel
- Node() { pPrev = NULL; nTupelRec = 0; }
+ Node() { pPrev = nullptr; nTupelRec = 0; }
};
class ObjectStack
@@ -69,10 +69,10 @@ class ObjectStack
Node* pRoot;
public:
- ObjectStack () { pRoot = NULL; }
+ ObjectStack () { pRoot = nullptr; }
const RSCINST & Top () { return pRoot->aInst; }
- bool IsEmpty() { return( pRoot == NULL ); }
+ bool IsEmpty() { return( pRoot == nullptr ); }
void Push( RSCINST aInst )
{
Node* pTmp;
diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index 43b32ca9d98a..13cdbc5a056d 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.hxx
@@ -42,7 +42,7 @@ class RscTop : public RefNode
protected:
RscTop( Atom nId, sal_uInt32 nTypIdent,
- RscTop * pSuperCl = NULL );
+ RscTop * pSuperCl = nullptr );
public:
OString aCallPar1; // class call without types until ResId
@@ -81,7 +81,7 @@ public:
// sets the variable
virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
- RSCINST * pDflt = NULL,
+ RSCINST * pDflt = nullptr,
RSCVAR nVarType = 0, sal_uInt32 nMask = 0,
Atom nDataBaseName = InvalidAtom );
@@ -93,7 +93,7 @@ public:
virtual RSCINST GetVariable( const RSCINST & rInst, Atom nVarName,
const RSCINST & rInitInst,
bool bInitDflt = false,
- RscTop * pCreateClass = NULL );
+ RscTop * pCreateClass = nullptr );
virtual RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName );
virtual RSCINST GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos,