Kaydet (Commit) f6262b3d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove redundant 'inline' keyword, Linux redux

Change-Id: I10c7dbd6a7acce309b056a1ae57c39f00f22c46d
üst 76db789d
......@@ -32,7 +32,7 @@ namespace connectivity
OEvoabConnection *m_pConnection;
public:
explicit OEvoabCatalog(OEvoabConnection *_pCon);
inline OEvoabConnection* getConnection() const { return m_pConnection; }
OEvoabConnection* getConnection() const { return m_pConnection; }
virtual void refreshTables() override;
virtual void refreshViews() override {}
virtual void refreshGroups() override {}
......
......@@ -68,10 +68,10 @@ namespace connectivity
/// @throws css::sdbc::SQLException
virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo );
inline OString const & getPassword() { return m_aPassword; }
inline void setPassword( OString const & aStr ) { m_aPassword = aStr; }
OString const & getPassword() { return m_aPassword; }
void setPassword( OString const & aStr ) { m_aPassword = aStr; }
// own methods
inline const OEvoabDriver& getDriver() const { return m_rDriver; }
const OEvoabDriver& getDriver() const { return m_rDriver; }
SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;}
void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;}
......
......@@ -85,7 +85,7 @@ namespace connectivity
virtual ~OEvoabDatabaseMetaData() override;
public:
inline OEvoabConnection* getOwnConnection() const { return m_pConnection; }
OEvoabConnection* getOwnConnection() const { return m_pConnection; }
explicit OEvoabDatabaseMetaData(OEvoabConnection* _pCon);
......
......@@ -45,12 +45,12 @@ namespace connectivity
explicit OEvoabResultSetMetaData(const OUString& _aTableName);
/// @throws css::sdbc::SQLException
void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns);
inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
{ return m_aEvoabFields[columnIndex - 1]; }
inline sal_Int32 getFieldSize() const
sal_Int32 getFieldSize() const
{return m_aEvoabFields.size();}
/// Avoid ambigous cast error from the compiler.
inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw()
{ return this; }
virtual sal_Int32 SAL_CALL getColumnCount( ) override;
......
......@@ -52,7 +52,6 @@ struct ProviderRequest
{
}
inline
bool CREATE_PROVIDER(
const OUString& Implname,
const Sequence< OUString > & Services,
......
......@@ -184,10 +184,10 @@ namespace connectivity
// TODO: Not used
//sal_Int32 sdbcColumnType(rtl::OUString typeName);
inline const ConnectionSettings& getConnectionSettings() const { return m_settings; }
const ConnectionSettings& getConnectionSettings() const { return m_settings; }
rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL);
inline const MysqlCDriver& getDriver() const { return m_rDriver;}
const MysqlCDriver& getDriver() const { return m_rDriver;}
}; /* OConnection */
// TODO: Not used.
......
......@@ -57,7 +57,7 @@ namespace connectivity
bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)(int), sal_Int32 _resultSetType );
public:
inline const OConnection& getOwnConnection() const { return m_rConnection; }
const OConnection& getOwnConnection() const { return m_rConnection; }
explicit ODatabaseMetaData(OConnection& _rCon);
virtual ~ODatabaseMetaData();
......
......@@ -51,7 +51,7 @@ namespace connectivity
{
}
inline rtl::OUString convert( const ::std::string& _string ) const
rtl::OUString convert( const ::std::string& _string ) const
{
return rtl::OUString( _string.c_str(), _string.size(), m_encoding );
}
......
......@@ -53,7 +53,7 @@ struct ProviderRequest
{
}
inline bool CREATE_PROVIDER(
bool CREATE_PROVIDER(
const rtl::OUString& Implname,
const Sequence< rtl::OUString > & Services,
::cppu::ComponentInstantiation Factory,
......
......@@ -48,7 +48,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
{
return m_aUnicodeEntry;
}
inline SalGenericDataType GetType() const
SalGenericDataType GetType() const
{
return m_eType;
}
......
......@@ -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 );
......
......@@ -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
......
......@@ -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 );
......
......@@ -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,
......
......@@ -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;
......
......@@ -578,9 +578,9 @@ struct YieldEntry
YieldFunc queued; // read and queue up events
YieldFunc handle; // handle pending events
inline int HasPendingEvent() const { return pending( fd, data ); }
inline int IsEventQueued() const { return queued( fd, data ); }
inline void HandleNextEvent() const { handle( fd, data ); }
int HasPendingEvent() const { return pending( fd, data ); }
int IsEventQueued() const { return queued( fd, data ); }
void HandleNextEvent() const { handle( fd, data ); }
};
#define MAX_NUM_DESCRIPTORS 128
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment