summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-04-24 02:25:11 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-04-27 08:27:50 +0200
commit7d71451e8e0226d3f3f523611f55132eda6ec10f (patch)
tree23fdf6441eb6f4d0b3cb4398f10efdc8de893f46
parent0c4d2767742d3a86a392eb328762d92050527cad (diff)
vcl: change pImpl class names to fit with existing convention
Change-Id: Iec6ce77f922df222d48240be09a817f5289a6662 Reviewed-on: https://gerrit.libreoffice.org/36861 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
-rw-r--r--include/vcl/errinf.hxx12
-rw-r--r--vcl/source/window/errinf.cxx18
2 files changed, 15 insertions, 15 deletions
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index 476bbb52ac41..677818701531 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -39,7 +39,7 @@ class ErrorContext;
class ErrorStringFactory;
class ErrorInfo;
class DynamicErrorInfo;
-class DynamicErrorInfo_Impl;
+class ImplDynamicErrorInfo;
enum class DialogMask;
namespace {
@@ -57,7 +57,7 @@ class VCL_DLLPUBLIC ErrorRegistry
friend class ErrorHandler;
friend class ErrorContext;
friend class ErrorStringFactory;
- friend class DynamicErrorInfo_Impl;
+ friend class ImplDynamicErrorInfo;
public:
ErrorRegistry();
@@ -158,7 +158,7 @@ private:
class SAL_WARN_UNUSED VCL_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
{
- friend class DynamicErrorInfo_Impl;
+ friend class ImplDynamicErrorInfo;
public:
DynamicErrorInfo(sal_uInt32 nUserId, DialogMask nMask);
@@ -168,7 +168,7 @@ public:
DialogMask GetDialogMask() const;
private:
- std::unique_ptr<DynamicErrorInfo_Impl> pImpl;
+ std::unique_ptr<ImplDynamicErrorInfo> pImpl;
};
@@ -202,7 +202,7 @@ private:
};
-struct ErrorContextImpl;
+struct ImplErrorContext;
class SAL_WARN_UNUSED VCL_DLLPUBLIC ErrorContext
{
@@ -218,7 +218,7 @@ public:
static ErrorContext* GetContext();
private:
- std::unique_ptr<ErrorContextImpl> pImpl;
+ std::unique_ptr<ImplErrorContext> pImpl;
};
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index d3b3ead2194e..0db74341ff9f 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -193,13 +193,13 @@ DialogMask ErrorHandler::HandleError(sal_uInt32 nErrCodeId, DialogMask nFlags)
return DialogMask::NONE;
}
-struct ErrorContextImpl
+struct ImplErrorContext
{
vcl::Window *pWin; // FIXME: should be VclPtr for strong lifecycle
};
ErrorContext::ErrorContext(vcl::Window *pWinP)
- : pImpl( new ErrorContextImpl )
+ : pImpl( new ImplErrorContext )
{
pImpl->pWin = pWinP;
TheErrorRegistry::get().contexts.insert(TheErrorRegistry::get().contexts.begin(), this);
@@ -221,7 +221,7 @@ vcl::Window* ErrorContext::GetParent()
return pImpl ? pImpl->pWin : nullptr;
}
-class DynamicErrorInfo_Impl
+class ImplDynamicErrorInfo
{
friend class DynamicErrorInfo;
friend class ErrorInfo;
@@ -236,7 +236,7 @@ private:
};
-void DynamicErrorInfo_Impl::RegisterError(DynamicErrorInfo *pDynErrInfo)
+void ImplDynamicErrorInfo::RegisterError(DynamicErrorInfo *pDynErrInfo)
{
// Register dynamic identifier
ErrorRegistry& rData = TheErrorRegistry::get();
@@ -252,7 +252,7 @@ void DynamicErrorInfo_Impl::RegisterError(DynamicErrorInfo *pDynErrInfo)
rData.nNextError=0;
}
-void DynamicErrorInfo_Impl::UnRegisterError(DynamicErrorInfo const *pDynErrInfo)
+void ImplDynamicErrorInfo::UnRegisterError(DynamicErrorInfo const *pDynErrInfo)
{
DynamicErrorInfo **ppDynErrInfo = TheErrorRegistry::get().ppDynErrInfo;
sal_uInt32 nIdx = (((sal_uInt32)(*pDynErrInfo) & ERRCODE_DYNAMIC_MASK) >> ERRCODE_DYNAMIC_SHIFT) - 1;
@@ -262,7 +262,7 @@ void DynamicErrorInfo_Impl::UnRegisterError(DynamicErrorInfo const *pDynErrInfo)
ppDynErrInfo[nIdx]=nullptr;
}
-ErrorInfo* DynamicErrorInfo_Impl::GetDynamicErrorInfo(sal_uInt32 nId)
+ErrorInfo* ImplDynamicErrorInfo::GetDynamicErrorInfo(sal_uInt32 nId)
{
sal_uInt32 nIdx = ((nId & ERRCODE_DYNAMIC_MASK)>>ERRCODE_DYNAMIC_SHIFT)-1;
DynamicErrorInfo* pDynErrInfo = TheErrorRegistry::get().ppDynErrInfo[nIdx];
@@ -276,7 +276,7 @@ ErrorInfo* DynamicErrorInfo_Impl::GetDynamicErrorInfo(sal_uInt32 nId)
ErrorInfo *ErrorInfo::GetErrorInfo(sal_uInt32 nId)
{
if(nId & ERRCODE_DYNAMIC_MASK)
- return DynamicErrorInfo_Impl::GetDynamicErrorInfo(nId);
+ return ImplDynamicErrorInfo::GetDynamicErrorInfo(nId);
else
return new ErrorInfo(nId);
}
@@ -287,7 +287,7 @@ ErrorInfo::~ErrorInfo()
DynamicErrorInfo::DynamicErrorInfo(sal_uInt32 nArgUserId, DialogMask nMask)
: ErrorInfo(nArgUserId),
- pImpl(new DynamicErrorInfo_Impl)
+ pImpl(new ImplDynamicErrorInfo)
{
pImpl->RegisterError(this);
pImpl->nMask=nMask;
@@ -295,7 +295,7 @@ DynamicErrorInfo::DynamicErrorInfo(sal_uInt32 nArgUserId, DialogMask nMask)
DynamicErrorInfo::~DynamicErrorInfo()
{
- DynamicErrorInfo_Impl::UnRegisterError(this);
+ ImplDynamicErrorInfo::UnRegisterError(this);
}
DynamicErrorInfo::operator sal_uInt32() const