[Libreoffice-commits] core.git: dtrans/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Tue May 24 20:44:49 UTC 2016
dtrans/source/win32/dnd/source.hxx | 6 ++----
dtrans/source/win32/dnd/sourcecontext.hxx | 6 ++----
dtrans/source/win32/dnd/target.hxx | 7 ++-----
dtrans/source/win32/dnd/targetdragcontext.hxx | 5 ++---
dtrans/source/win32/dnd/targetdropcontext.hxx | 5 ++---
5 files changed, 10 insertions(+), 19 deletions(-)
New commits:
commit d5397bf17d1b2d268c1d5905079b69619ea0467a
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Tue May 24 17:27:38 2016 +0200
C++11: disable ctors/operators with delete (dtrans)
replace the old declare and don't implement pattern
with C++11 delete keyword.
remove obsolete default ctor declarations.
Change-Id: I90cce42445e3b0558dc9b6e0f9cd2a27359e5d9e
Reviewed-on: https://gerrit.libreoffice.org/25411
Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index 0f73d6c..61f21eb 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -57,10 +57,6 @@ class DragSource:
// The mouse button that set off the drag and drop operation
short m_MouseButton;
- DragSource();
- DragSource(const DragSource&);
- DragSource &operator= ( const DragSource&);
-
// First starting a new drag and drop thread if
// the last one has finished
void StartDragImpl(
@@ -89,6 +85,8 @@ public:
public:
explicit DragSource(const Reference<XComponentContext>& rxContext);
virtual ~DragSource();
+ DragSource(const DragSource&) = delete;
+ DragSource &operator= ( const DragSource&) = delete;
// XInitialization
virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index 937c5d9..9f1788b 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.hxx
@@ -44,13 +44,11 @@ class SourceContext: public MutexDummy,
// the action ( copy, move etc)
sal_Int8 m_currentAction;
- SourceContext();
- SourceContext( const SourceContext&);
- SourceContext &operator= (const SourceContext& );
-
public:
SourceContext( DragSource* pSource, const Reference<XDragSourceListener>& listener);
~SourceContext();
+ SourceContext(const SourceContext&) = delete;
+ SourceContext &operator= (const SourceContext&) = delete;
virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl )
throw( RuntimeException);
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 4e7d3b8..47ff87c 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -106,14 +106,11 @@ private:
Reference<XDropTargetDragContext> m_currentDragContext;
Reference<XDropTargetDropContext> m_currentDropContext;
-private:
- DropTarget();
- DropTarget(DropTarget&);
- DropTarget &operator= (DropTarget&);
-
public:
explicit DropTarget(const Reference<XComponentContext>& rxContext);
virtual ~DropTarget();
+ DropTarget(DropTarget&) = delete;
+ DropTarget &operator= (DropTarget&) = delete;
// Overrides WeakComponentImplHelper::disposing which is called by
// WeakComponentImplHelper::dispose
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index ed329c0..3d061b4 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -37,12 +37,11 @@ class TargetDragContext: public WeakImplHelper<XDropTargetDragContext>
// to non-interface functions of m_pDropTarget
DropTarget* m_pDropTarget;
- TargetDragContext();
- TargetDragContext( const TargetDragContext&);
- TargetDragContext &operator= ( const TargetDragContext&);
public:
explicit TargetDragContext(DropTarget* pTarget);
~TargetDragContext();
+ TargetDragContext( const TargetDragContext&) = delete;
+ TargetDragContext &operator= ( const TargetDragContext&) = delete;
virtual void SAL_CALL acceptDrag( sal_Int8 dragOperation )
throw( RuntimeException);
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index a7ae0e6..ec2e5b2 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -36,12 +36,11 @@ class TargetDropContext: public WeakImplHelper<XDropTargetDropContext>
// to non-interface functions of m_pDropTarget
DropTarget* m_pDropTarget;
- TargetDropContext();
- TargetDropContext( const TargetDropContext&);
- TargetDropContext &operator= ( const TargetDropContext&);
public:
explicit TargetDropContext(DropTarget* pTarget);
~TargetDropContext();
+ TargetDropContext( const TargetDropContext&) = delete;
+ TargetDropContext &operator= ( const TargetDropContext&) = delete;
// XDropTargetDragContext
virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation )
More information about the Libreoffice-commits
mailing list