diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-11-26 11:15:11 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-11-26 13:48:21 +0000 |
commit | ed6aceab08e1c3951e1e33aa3d8070c57589b5db (patch) | |
tree | 9c2e2abc8cb129c0ed1040b536b6b11a6b87fd7d /include/vcl | |
parent | bc8dcb2b5db706c8c5bdd6cf3ac1311d6625d962 (diff) |
vcl: reduce pointless timer / scheduler / idle includes.
Change-Id: I8bf7f8d6ba1a54f2969e055956fadc52ff6c8673
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/dialog.hxx | 1 | ||||
-rw-r--r-- | include/vcl/edit.hxx | 6 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 7 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index d4bbe5ce21dd..eb4a2fdda033 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -23,7 +23,6 @@ #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/syswin.hxx> -#include <vcl/timer.hxx> #include <vcl/vclptr.hxx> // - Dialog - diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index da5dc164e739..3e6fbb77c5da 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -27,8 +27,6 @@ #include <tools/solar.h> #include <vcl/dllapi.h> -#include <vcl/timer.hxx> -#include <vcl/idle.hxx> #include <vcl/menu.hxx> #include <vcl/dndhelp.hxx> #include <vcl/vclptr.hxx> @@ -70,6 +68,8 @@ public: enum AutocompleteAction{ AUTOCOMPLETE_KEYINPUT, AUTOCOMPLETE_TABFORWARD, AUTOCOMPLETE_TABBACKWARD }; +class Timer; + // - Edit - class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropClient { @@ -205,7 +205,7 @@ public: virtual bool IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); - virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = nullptr; } + virtual void DisableUpdateData(); void SetEchoChar( sal_Unicode c ); sal_Unicode GetEchoChar() const { return mcEchoChar; } diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index a2e5a0ac1e27..e0b4fd731fde 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -25,12 +25,10 @@ #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/image.hxx> -#include <vcl/timer.hxx> -#include <vcl/idle.hxx> #include <vector> +class Timer; class UserDrawEvent; - struct ImplToolItem; struct ImplToolSize; struct ImplToolBoxPrivateData; @@ -67,6 +65,7 @@ struct ImplToolSize sal_uInt16 mnLines; }; +class Idle; class VCL_DLLPUBLIC ToolBox : public DockingWindow { friend class FloatingWindow; @@ -76,7 +75,7 @@ private: ImplToolBoxPrivateData* mpData; std::vector<ImplToolSize> maFloatSizes; ImageList maImageList; - Idle maIdle; + Idle *mpIdle; Rectangle maUpperRect; Rectangle maLowerRect; Rectangle maOutDockRect; |