diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-29 15:04:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-06-02 08:39:44 +0200 |
| commit | 468e8d53fbb07dce271a1f7fabf5711993e01eb7 (patch) | |
| tree | 60a0474d2789904e17ff22623f01175c11836647 /vcl/inc | |
| parent | e9dbdc9fc6ff943650e6e18986ed1cce913971ef (diff) | |
inline some use-once typedefs
Change-Id: I335e0c5cf7944efa487e4535a9e6a5baab2f36dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95140
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/svdata.hxx | 5 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksys.hxx | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 59daa93cca67..588a51de7115 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -123,8 +123,6 @@ public: virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints ) override; }; -typedef std::vector<Link<VclWindowEvent&,bool> > SVAppKeyListeners; - typedef std::pair<VclPtr<vcl::Window>, ImplPostEventData *> ImplPostEventPair; struct ImplSVAppData @@ -134,7 +132,8 @@ struct ImplSVAppData std::unique_ptr<AllSettings> mpSettings; // Application settings LocaleConfigurationListener* mpCfgListener = nullptr; VclEventListeners maEventListeners; // listeners for vcl events (eg, extended toolkit) - SVAppKeyListeners maKeyListeners; // listeners for key events only (eg, extended toolkit) + std::vector<Link<VclWindowEvent&,bool> > + maKeyListeners; // listeners for key events only (eg, extended toolkit) std::vector<ImplPostEventPair> maPostedEventList; ImplAccelManager* mpAccelMgr; // Accelerator Manager std::optional<OUString> mxAppName; // Application name diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx index 8775f5af03db..fa6879c2125b 100644 --- a/vcl/inc/unx/gtk/gtksys.hxx +++ b/vcl/inc/unx/gtk/gtksys.hxx @@ -16,11 +16,9 @@ class GtkSalSystem final : public SalGenericSystem { - typedef std::deque<std::pair<GdkScreen*, int> > ScreenMonitors_t; - GdkDisplay *mpDisplay; // Number of monitors for every active screen. - ScreenMonitors_t maScreenMonitors; + std::deque<std::pair<GdkScreen*, int> > maScreenMonitors; public: GtkSalSystem(); virtual ~GtkSalSystem() override; |