summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-01-25 19:34:52 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-01-25 19:34:52 +1100
commit4c8e866a6ea3cbafd2a8c89538f53a76eeb81d55 (patch)
tree7fc1a1d3ca21c0743f4b41689588902aab4e7bac
parent14082acc33a55055cd0b44070aba7aa4f4c291a3 (diff)
git: rename dndlcon.{hxx|cxx} to dndlistenercontainer.{hxx|cxx}
Change-Id: I549a17f68971f68313c6665fb4b04a88f7084ad6
-rw-r--r--vcl/Library_vcl.mk2
-rw-r--r--vcl/inc/dndlistenercontainer.hxx (renamed from vcl/inc/dndlcon.hxx)0
-rw-r--r--vcl/inc/pch/precompiled_vcl.hxx12
-rw-r--r--vcl/source/window/accessibility.cxx2
-rw-r--r--vcl/source/window/dndeventdispatcher.cxx2
-rw-r--r--vcl/source/window/dndlistenercontainer.cxx (renamed from vcl/source/window/dndlcon.cxx)2
-rw-r--r--vcl/source/window/mouse.cxx3
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/source/window/winproc.cxx2
9 files changed, 12 insertions, 15 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1a5dc2f4a5e4..e53ce10b9991 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -161,7 +161,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/dialog \
vcl/source/window/dlgctrl \
vcl/source/window/dndeventdispatcher \
- vcl/source/window/dndlcon \
+ vcl/source/window/dndlistenercontainer \
vcl/source/window/dockingarea \
vcl/source/window/dockmgr \
vcl/source/window/dockwin \
diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlistenercontainer.hxx
index be009cef7fa4..be009cef7fa4 100644
--- a/vcl/inc/dndlcon.hxx
+++ b/vcl/inc/dndlistenercontainer.hxx
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 13c88b1ab32f..5b1302cbf3c7 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2016-01-10 11:16:04 using:
+ Generated on 2016-01-25 19:34:08 using:
./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -36,7 +36,6 @@
#include <functional>
#include <iomanip>
#include <limits.h>
-#include <map>
#include <math.h>
#include <memory>
#include <new>
@@ -44,19 +43,18 @@
#include <outdev.h>
#include <set>
#include <sstream>
-#include <stack>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <string>
#include <type_traits>
-#include <typeinfo>
#include <unordered_map>
#include <utility>
#include <vector>
#include <window.h>
#include <boost/dynamic_bitset.hpp>
#include <boost/functional/hash.hpp>
+#include <boost/intrusive_ptr.hpp>
#include <boost/math/special_functions/sinc.hpp>
#include <boost/multi_array.hpp>
#include <boost/optional.hpp>
@@ -72,7 +70,6 @@
#include <osl/file.hxx>
#include <osl/getglobalmutex.hxx>
#include <osl/interlck.h>
-#include <osl/module.h>
#include <osl/module.hxx>
#include <osl/mutex.hxx>
#include <osl/pipe.h>
@@ -181,6 +178,7 @@
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
#include <vcl/tabctrl.hxx>
+#include <vcl/tabpage.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
@@ -219,7 +217,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/lang/Locale.hpp>
@@ -260,7 +257,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/weakagg.hxx>
#include <cppuhelper/weakref.hxx>
-#include <dndlcon.hxx>
+#include <dndlistenercontainer.hxx>
#include <fontattributes.hxx>
#include <fontinstance.hxx>
#include <helpwin.hxx>
@@ -292,7 +289,6 @@
#include <tools/poly.hxx>
#include <tools/rc.h>
#include <tools/resid.hxx>
-#include <tools/resmgr.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
#include <tools/time.hxx>
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index a74fc30755e6..f31a6f93006b 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -71,7 +71,7 @@
#include "brdwin.hxx"
#include "helpwin.hxx"
#include "sallayout.hxx"
-#include "dndlcon.hxx"
+#include "dndlistenercontainer.hxx"
#include "dndeventdispatcher.hxx"
#include "com/sun/star/accessibility/XAccessible.hpp"
diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx
index 04a8ea9a6759..165ad27cea9e 100644
--- a/vcl/source/window/dndeventdispatcher.cxx
+++ b/vcl/source/window/dndeventdispatcher.cxx
@@ -18,7 +18,7 @@
*/
#include "dndeventdispatcher.hxx"
-#include <dndlcon.hxx>
+#include "dndlistenercontainer.hxx"
#include <window.h>
#include <svdata.hxx>
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlistenercontainer.cxx
index 24503c49fdde..76ef78d7784a 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlistenercontainer.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <dndlcon.hxx>
+#include "dndlistenercontainer.hxx"
using namespace ::cppu;
using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 5c9fca378f3e..3c9475950334 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -37,7 +37,8 @@
#include <salobj.hxx>
#include <salgdi.hxx>
#include <salframe.hxx>
-#include <dndlcon.hxx>
+
+#include "dndlistenercontainer.hxx"
#include "dndeventdispatcher.hxx"
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index be6a3e4097df..460d8af8a6fb 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -55,7 +55,7 @@
#include <outdev.h>
#include <brdwin.hxx>
#include <helpwin.hxx>
-#include <dndlcon.hxx>
+#include "dndlistenercontainer.hxx"
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/awt/XDisplayConnection.hpp>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 58211dace047..9e9a7fcd050b 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -48,7 +48,7 @@
#include <helpwin.hxx>
#include <brdwin.hxx>
#include <salgdi.hxx>
-#include <dndlcon.hxx>
+#include "dndlistenercontainer.hxx"
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>