diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /vcl/generic | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/fontconfig.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/print/genprnpsp.cxx | 4 | ||||
| -rw-r--r-- | vcl/generic/print/prtsetup.cxx | 2 | ||||
| -rw-r--r-- | vcl/generic/print/prtsetup.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 05581c55792d..72ed0e23c3d7 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -883,7 +883,7 @@ namespace #if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) guint get_xid_for_dbus() { - const Window *pTopWindow = Application::IsHeadlessModeEnabled() ? NULL : Application::GetActiveTopWindow(); + const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? NULL : Application::GetActiveTopWindow(); const SystemEnvData* pEnvData = pTopWindow ? pTopWindow->GetSystemData() : NULL; return pEnvData ? pEnvData->aWindow : 0; } diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 9304ac757d7a..d0dfb28b1e19 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -99,13 +99,13 @@ namespace public: // parent window, Query text, initial value - QueryString(Window*, OUString &, OUString &); + QueryString(vcl::Window*, OUString &, OUString &); }; /* * QueryString */ - QueryString::QueryString(Window* pParent, OUString& rQuery, OUString& rRet) + QueryString::QueryString(vcl::Window* pParent, OUString& rQuery, OUString& rRet) : ModalDialog(pParent, "QueryDialog", "vcl/ui/querydialog.ui" ) , m_rReturnValue( rRet ) diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx index ea93c2df1abf..a6ea399b308c 100644 --- a/vcl/generic/print/prtsetup.cxx +++ b/vcl/generic/print/prtsetup.cxx @@ -71,7 +71,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con * RTSDialog */ -RTSDialog::RTSDialog(const PrinterInfo& rJobData, const OUString& rPrinter, Window* pParent) +RTSDialog::RTSDialog(const PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent) : TabDialog(pParent, "PrinterPropertiesDialog", "vcl/ui/printerpropertiesdialog.ui") , m_aJobData(rJobData) , m_aPrinter(rPrinter) diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx index dfa124911c15..8f3d43d3a199 100644 --- a/vcl/generic/print/prtsetup.hxx +++ b/vcl/generic/print/prtsetup.hxx @@ -63,7 +63,7 @@ class RTSDialog : public TabDialog // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); public: - RTSDialog(const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, Window* pParent = NULL); + RTSDialog(const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent = NULL); virtual ~RTSDialog(); const ::psp::PrinterInfo& getSetup() const { return m_aJobData; } |