diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:32:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:33:37 +0200 |
| commit | 54e87df11faf697d3b2666198a3d20b3ee091419 (patch) | |
| tree | 8cfe316f012a4969ca6980fa6ac2fdb3a9424118 /avmedia | |
| parent | 3aac11a1233f679ea813fee8b8de134553d7db60 (diff) | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 72e6a03371b7..c42e4c130082 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -90,7 +90,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput) // If *.dae file is not in the local file system, then copy it to a temp folder for the conversion OUString sInput = rSourceURL; const INetURLObject aSourceURLObj(rSourceURL); - if( aSourceURLObj.GetProtocol() != INetProtocol::FILE ) + if( aSourceURLObj.GetProtocol() != INetProtocol::File ) { try { diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 9713666a13a9..a40d8a384be2 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -339,7 +339,7 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo const INetURLObject aURL( rURL ); bool bRet = false; - if( aURL.GetProtocol() != INetProtocol::NOT_VALID ) + if( aURL.GetProtocol() != INetProtocol::NotValid ) { if( bDeep || pPreferredSizePixel ) { diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 9916b4451a85..7a6863b1b2bc 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -310,7 +310,7 @@ void MediaWindowImpl::setURL( const OUString& rURL, { INetURLObject aURL( rURL ); - if (aURL.GetProtocol() != INetProtocol::NOT_VALID) + if (aURL.GetProtocol() != INetProtocol::NotValid) maFileURL = aURL.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); else maFileURL = rURL; |