From c4a8f288a1e799f1431603a884a752162297203d Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 7 Apr 2020 15:43:39 +0200 Subject: [PATCH] Use more common function name for initialization --- linphone-app/src/app/App.cpp | 2 +- .../src/components/other/desktop-tools/DesktopToolsLinux.hpp | 2 +- .../src/components/other/desktop-tools/DesktopToolsMacOs.hpp | 2 +- .../src/components/other/desktop-tools/DesktopToolsMacOs.mm | 2 +- .../src/components/other/desktop-tools/DesktopToolsWindows.hpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp index 59cbe5662..e3a26cc43 100644 --- a/linphone-app/src/app/App.cpp +++ b/linphone-app/src/app/App.cpp @@ -209,7 +209,7 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true, Mode::U qInfo() << QStringLiteral("Starting " APPLICATION_NAME " (bin: " EXECUTABLE_NAME ")"); qInfo() << QStringLiteral("Use locale: %1").arg(mLocale); - DesktopTools::initialize(); + DesktopTools::init(); } App::~App () { diff --git a/linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.hpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.hpp index 26446ee8b..d3cf5f96b 100644 --- a/linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.hpp +++ b/linphone-app/src/components/other/desktop-tools/DesktopToolsLinux.hpp @@ -38,7 +38,7 @@ public: bool getScreenSaverStatus () const; void setScreenSaverStatus (bool status); - static void initialization(){} + static void init(){} static void applicationStateChanged(Qt::ApplicationState){}; signals: diff --git a/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.hpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.hpp index f1f1fa6ce..a9c7c442f 100644 --- a/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.hpp +++ b/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.hpp @@ -36,7 +36,7 @@ public: bool getScreenSaverStatus () const; void setScreenSaverStatus (bool status); - static void initialize(); // Do first initialization + static void init(); // Do first initialization static void applicationStateChanged(Qt::ApplicationState currentState); diff --git a/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.mm b/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.mm index ec6747f15..1ec5c1f12 100644 --- a/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.mm +++ b/linphone-app/src/components/other/desktop-tools/DesktopToolsMacOs.mm @@ -1,7 +1,7 @@ #include "DesktopToolsMacOs.hpp" #import -void DesktopTools::initialize(){ +void DesktopTools::init(){ // Request permissions if([AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo] != AVAuthorizationStatusAuthorized) [AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo completionHandler:^(BOOL) {}]; diff --git a/linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.hpp b/linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.hpp index 2db14634f..a0f24852e 100644 --- a/linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.hpp +++ b/linphone-app/src/components/other/desktop-tools/DesktopToolsWindows.hpp @@ -37,7 +37,7 @@ public: bool getScreenSaverStatus () const; void setScreenSaverStatus (bool status); - static void initialization(){} + static void init(){} static void applicationStateChanged(Qt::ApplicationState){}; signals: