summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-07 08:12:52 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-07 08:12:52 +0100
commitf6262b3dcb4126ea03802e66ddf5bfa8833e6328 (patch)
tree947d25a477987d1dbb3b0f43a519ae6808184e1a /vcl/inc
parent76db789dc777a4888b95d9f6665ce45bd667b957 (diff)
Remove redundant 'inline' keyword, Linux redux
Change-Id: I10c7dbd6a7acce309b056a1ae57c39f00f22c46d
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/unx/gendata.hxx2
-rw-r--r--vcl/inc/unx/gendisp.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx6
-rw-r--r--vcl/inc/unx/saldata.hxx2
-rw-r--r--vcl/inc/unx/saldisp.hxx22
-rw-r--r--vcl/inc/unx/salgdi.h6
6 files changed, 20 insertions, 20 deletions
diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 00c99627bbc6..8a34120d2541 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -48,7 +48,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
{
return m_aUnicodeEntry;
}
- inline SalGenericDataType GetType() const
+ SalGenericDataType GetType() const
{
return m_eType;
}
diff --git a/vcl/inc/unx/gendisp.hxx b/vcl/inc/unx/gendisp.hxx
index 21e131226a19..435b81189d81 100644
--- a/vcl/inc/unx/gendisp.hxx
+++ b/vcl/inc/unx/gendisp.hxx
@@ -53,7 +53,7 @@ public:
SalGenericDisplay();
virtual ~SalGenericDisplay();
- inline osl::Mutex& getEventGuardMutex() { return m_aEventGuard; }
+ osl::Mutex& getEventGuardMutex() { return m_aEventGuard; }
void registerFrame( SalFrame* pFrame );
virtual void deregisterFrame( SalFrame* pFrame );
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 198e38414c62..bf70ba1694dc 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -258,9 +258,9 @@ public:
GtkSalGraphics(GtkSalFrame *, GtkWidget *window, SalX11Screen nXScreen);
virtual ~GtkSalGraphics() override;
- inline GtkWidget* GetGtkWidget() const { return m_pWindow; }
- inline GdkWindow* GetGdkWindow() const { return m_pWindow->window; }
- inline GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); }
+ GtkWidget* GetGtkWidget() const { return m_pWindow; }
+ GdkWindow* GetGdkWindow() const { return m_pWindow->window; }
+ GtkSalFrame* GetGtkFrame() const { return static_cast<GtkSalFrame*>(m_pFrame); }
void SetWindow( GtkWidget* window ) { m_pWindow = window; }
// will be set when UI theme was changed
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index a115298c3a63..9e8928122a97 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -70,7 +70,7 @@ public:
void DeleteDisplay(); // for shutdown
- inline SalXLib* GetLib() const { return pXLib_; }
+ SalXLib* GetLib() const { return pXLib_; }
static void Timeout( bool idle );
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index d64b67ec6ca8..de4e93cf3950 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -92,10 +92,10 @@ public:
~SalVisual();
SalVisual( const XVisualInfo* pXVI );
- inline VisualID GetVisualId() const { return visualid; }
- inline Visual *GetVisual() const { return visual; }
- inline int GetClass() const { return c_class; }
- inline int GetDepth() const { return depth; }
+ VisualID GetVisualId() const { return visualid; }
+ Visual *GetVisual() const { return visual; }
+ int GetClass() const { return c_class; }
+ int GetDepth() const { return depth; }
Pixel GetTCPixel( SalColor nColor ) const;
SalColor GetTCColor( Pixel nPixel ) const;
@@ -122,14 +122,14 @@ public:
SalColormap( sal_uInt16 nDepth );
SalColormap();
- inline Colormap GetXColormap() const { return m_hColormap; }
- inline const SalDisplay* GetDisplay() const { return m_pDisplay; }
+ Colormap GetXColormap() const { return m_hColormap; }
+ const SalDisplay* GetDisplay() const { return m_pDisplay; }
inline Display* GetXDisplay() const;
- inline const SalVisual& GetVisual() const { return m_aVisual; }
- inline Visual* GetXVisual() const { return m_aVisual.GetVisual(); }
- inline Pixel GetWhitePixel() const { return m_nWhitePixel; }
- inline Pixel GetBlackPixel() const { return m_nBlackPixel; }
- inline Pixel GetUsed() const { return m_nUsed; }
+ const SalVisual& GetVisual() const { return m_aVisual; }
+ Visual* GetXVisual() const { return m_aVisual.GetVisual(); }
+ Pixel GetWhitePixel() const { return m_nWhitePixel; }
+ Pixel GetBlackPixel() const { return m_nBlackPixel; }
+ Pixel GetUsed() const { return m_nUsed; }
bool GetXPixels( XColor &rColor,
int r,
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index fb7d0fe6265a..90d3fd6b3f70 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -84,11 +84,11 @@ public:
inline Display* GetXDisplay() const;
inline const SalVisual& GetVisual() const;
SalGeometryProvider* GetGeometryProvider() const;
- inline Drawable GetDrawable() const { return hDrawable_; }
+ Drawable GetDrawable() const { return hDrawable_; }
void SetDrawable( Drawable d, SalX11Screen nXScreen );
XRenderPictFormat* GetXRenderFormat() const;
- inline void SetXRenderFormat( XRenderPictFormat* pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
- inline const SalColormap& GetColormap() const { return *m_pColormap; }
+ void SetXRenderFormat( XRenderPictFormat* pXRenderFormat ) { m_pXRenderFormat = pXRenderFormat; }
+ const SalColormap& GetColormap() const { return *m_pColormap; }
using SalGraphics::GetPixel;
inline Pixel GetPixel( SalColor nSalColor ) const;