diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 13:25:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:41:15 +0000 |
| commit | 8ac4240efe975e9689e8dfc23dc3c1b88eee6dcf (patch) | |
| tree | 0ec90ad5e02bd191e7e36c3f862d10a7ff4c559a /vcl | |
| parent | 12aafb69fab3c7f91aa727ace19c1df7c53edd64 (diff) | |
Convert ApplicationEvent::Type to scoped enum
Change-Id: Ie65951d5fd1e155e3d3b36d4725792fb95fb9a52
Reviewed-on: https://gerrit.libreoffice.org/25608
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/salmenu.cxx | 2 | ||||
| -rw-r--r-- | vcl/osx/vclnsapp.mm | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index 36569a5750a1..b5f3badb6bd4 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -86,7 +86,7 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = nullptr; else if( nDialog == ShowDialogId::Preferences ) aDialog = "PREFERENCES"; const ApplicationEvent* pAppEvent = new ApplicationEvent( - ApplicationEvent::TYPE_SHOWDIALOG, aDialog); + ApplicationEvent::Type::ShowDialog, aDialog); AquaSalInstance::aAppEventList.push_back( pAppEvent ); } } diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm index 14ce7ec3417f..a8a26a00e122 100644 --- a/vcl/osx/vclnsapp.mm +++ b/vcl/osx/vclnsapp.mm @@ -323,7 +323,7 @@ aFile.push_back( GetOUString( pFile ) ); if( ! AquaSalInstance::isOnCommandLine( aFile[0] ) ) { - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::TYPE_OPEN, aFile); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Open, aFile); AquaSalInstance::aAppEventList.push_back( pAppEvent ); } return YES; @@ -351,7 +351,7 @@ // we have no back channel here, we have to assume success, in which case // replyToOpenOrPrint does not need to be called according to documentation // [app replyToOpenOrPrint: NSApplicationDelegateReplySuccess]; - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::TYPE_OPEN, aFileList); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Open, aFileList); AquaSalInstance::aAppEventList.push_back( pAppEvent ); } } @@ -361,7 +361,7 @@ (void)app; std::vector<OUString> aFile; aFile.push_back( GetOUString( pFile ) ); - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::TYPE_PRINT, aFile); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFile); AquaSalInstance::aAppEventList.push_back( pAppEvent ); return YES; } @@ -380,7 +380,7 @@ { aFileList.push_back( GetOUString( pFile ) ); } - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::TYPE_PRINT, aFileList); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFileList); AquaSalInstance::aAppEventList.push_back( pAppEvent ); // we have no back channel here, we have to assume success // correct handling would be NSPrintingReplyLater and then send [app replyToOpenOrPrint] @@ -410,7 +410,7 @@ if( aReply == NSTerminateNow ) { - ApplicationEvent aEv(ApplicationEvent::TYPE_PRIVATE_DOSHUTDOWN); + ApplicationEvent aEv(ApplicationEvent::Type::PrivateDoShutdown); GetpApp()->AppEvent( aEv ); ImplImageTree::get().shutDown(); // DeInitVCL should be called in ImplSVMain - unless someon _exits first which |