Fix "qualifiers ignored on function return type" warnings

This commit fixes return type warnings from EmbedLiteView, EmbedLiteWindow, and EmbedContentController.h.
sailfishos · Apr 8, 2020 · b581969 · b581969
1 parent b92bd1e
commit b581969
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/embedding/embedlite/EmbedLiteView.cpp b/embedding/embedlite/EmbedLiteView.cpp
@@ -69,8 +69,7 @@ EmbedLiteView::SetListener(EmbedLiteViewListener* aListener)
    mListener = aListener;
 }
 
-EmbedLiteViewListener* const
-EmbedLiteView::GetListener() const
+EmbedLiteViewListener *EmbedLiteView::GetListener() const
 {
   return mListener ? mListener : &sFakeListener;
 }

diff --git a/embedding/embedlite/EmbedLiteView.h b/embedding/embedlite/EmbedLiteView.h
@@ -69,7 +69,7 @@ class EmbedLiteView
 
   // Listener setup, call this with null pointer if listener destroyed before EmbedLiteView
   virtual void SetListener(EmbedLiteViewListener* aListener);
-  virtual EmbedLiteViewListener* const GetListener() const;
+  virtual EmbedLiteViewListener *GetListener() const;
 
   // Embed Interface
   virtual void LoadURL(const char* aUrl);

diff --git a/embedding/embedlite/EmbedLiteWindow.cpp b/embedding/embedlite/EmbedLiteWindow.cpp
@@ -53,7 +53,7 @@ void EmbedLiteWindow::SetListener(EmbedLiteWindowListener* aListener)
   mListener = aListener;
 }
 
-EmbedLiteWindowListener* const EmbedLiteWindow::GetListener() const
+EmbedLiteWindowListener *EmbedLiteWindow::GetListener() const
 {
   return mListener ? mListener : &sFakeWindowListener;
 }

diff --git a/embedding/embedlite/EmbedLiteWindow.h b/embedding/embedlite/EmbedLiteWindow.h
@@ -71,7 +71,7 @@ class EmbedLiteWindow {
   EmbedLiteWindow(EmbedLiteApp* app, PEmbedLiteWindowParent*, uint32_t id);
 
   virtual void SetListener(EmbedLiteWindowListener* aListener);
-  virtual EmbedLiteWindowListener* const GetListener() const;
+  virtual EmbedLiteWindowListener *GetListener() const;
 
   // PEmbedLiteWindow:
   virtual void SetSize(int width, int height);

diff --git a/embedding/embedlite/embedthread/EmbedContentController.cpp b/embedding/embedlite/embedthread/EmbedContentController.cpp
@@ -180,7 +180,7 @@ void EmbedContentController::PostDelayedTask(Task* aTask, int aDelayMs)
   MessageLoop::current()->PostDelayedTask(FROM_HERE, aTask, aDelayMs);
 }
 
-EmbedLiteViewListener* const EmbedContentController::GetListener() const
+EmbedLiteViewListener *EmbedContentController::GetListener() const
 {
   static FakeListener sFakeListener;
   return mRenderFrame && mRenderFrame->mView ?

diff --git a/embedding/embedlite/embedthread/EmbedContentController.h b/embedding/embedlite/embedthread/EmbedContentController.h
@@ -45,7 +45,7 @@ class EmbedContentController : public mozilla::layers::GeckoContentController
   virtual void NotifyFlushComplete() override;
 
 private:
-  EmbedLiteViewListener* const GetListener() const;
+  EmbedLiteViewListener *GetListener() const;
   void DoRequestContentRepaint(const FrameMetrics& aFrameMetrics);
   void DoSendScrollEvent(const FrameMetrics& aFrameMetrics);
   void DoRequestFlingSnap(const FrameMetrics::ViewID &aScrollId, const mozilla::CSSPoint &aDestination);