summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/app/saldisp.cxx16
-rw-r--r--vcl/unx/generic/desktopdetect/desktopdetector.cxx2
-rw-r--r--vcl/unx/generic/dtrans/bmp.cxx14
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx2
-rw-r--r--vcl/unx/generic/glyphs/glyphcache.cxx2
-rw-r--r--vcl/unx/generic/print/genprnpsp.cxx4
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkaction.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atktable.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atktextattributes.cxx3
-rw-r--r--vcl/unx/gtk/a11y/atkwrapper.cxx2
-rw-r--r--vcl/unx/gtk/gtksalframe.cxx2
-rw-r--r--vcl/unx/gtk/salnativewidgets-gtk.cxx4
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx2
-rw-r--r--vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx2
15 files changed, 30 insertions, 31 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b3251495b323..dbe1995f5150 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -85,21 +85,21 @@ typedef unsigned long Pixel;
using namespace vcl_sal;
#ifdef DBG_UTIL
-static inline const char *Null( const char *p ) { return p ? p : ""; }
-static inline const char *GetEnv( const char *p ) { return Null( getenv( p ) ); }
-static inline const char *KeyStr( KeySym n ) { return Null( XKeysymToString( n ) ); }
+static const char *Null( const char *p ) { return p ? p : ""; }
+static const char *GetEnv( const char *p ) { return Null( getenv( p ) ); }
+static const char *KeyStr( KeySym n ) { return Null( XKeysymToString( n ) ); }
-static inline const char *GetAtomName( Display *d, Atom a )
+static const char *GetAtomName( Display *d, Atom a )
{ return Null( XGetAtomName( d, a ) ); }
-static inline double Hypothenuse( long w, long h )
+static double Hypothenuse( long w, long h )
{ return sqrt( static_cast<double>((w*w)+(h*h)) ); }
#endif
-static inline int ColorDiff( int r, int g, int b )
+static int ColorDiff( int r, int g, int b )
{ return (r*r)+(g*g)+(b*b); }
-static inline int ColorDiff( Color c1, int r, int g, int b )
+static int ColorDiff( Color c1, int r, int g, int b )
{ return ColorDiff( static_cast<int>(c1.GetRed())-r,
static_cast<int>(c1.GetGreen())-g,
static_cast<int>(c1.GetBlue())-b ); }
@@ -788,7 +788,7 @@ OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
return aRet;
}
-static inline KeySym sal_XModifier2Keysym( Display *pDisplay,
+static KeySym sal_XModifier2Keysym( Display *pDisplay,
XModifierKeymap const *pXModMap,
int n )
{
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 56f6fe1d2d6c..eccba34fdce2 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -119,7 +119,7 @@ static bool is_gnome_desktop( Display* pDisplay )
static bool bWasXError = false;
-static inline bool WasXError()
+static bool WasXError()
{
bool bRet = bWasXError;
bWasXError = false;
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index 7f3f27022099..57399b238c89 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -41,13 +41,13 @@ using namespace x11;
* helper functions
*/
-static inline void writeLE( sal_uInt16 nNumber, sal_uInt8* pBuffer )
+static void writeLE( sal_uInt16 nNumber, sal_uInt8* pBuffer )
{
pBuffer[ 0 ] = (nNumber & 0xff);
pBuffer[ 1 ] = ((nNumber>>8)&0xff);
}
-static inline void writeLE( sal_uInt32 nNumber, sal_uInt8* pBuffer )
+static void writeLE( sal_uInt32 nNumber, sal_uInt8* pBuffer )
{
pBuffer[ 0 ] = (nNumber & 0xff);
pBuffer[ 1 ] = ((nNumber>>8)&0xff);
@@ -55,7 +55,7 @@ static inline void writeLE( sal_uInt32 nNumber, sal_uInt8* pBuffer )
pBuffer[ 3 ] = ((nNumber>>24)&0xff);
}
-static inline sal_uInt16 readLE16( const sal_uInt8* pBuffer )
+static sal_uInt16 readLE16( const sal_uInt8* pBuffer )
{
//This is untainted data which comes from a controlled source
//so, using a byte-swapping pattern which coverity doesn't
@@ -66,7 +66,7 @@ static inline sal_uInt16 readLE16( const sal_uInt8* pBuffer )
return v;
}
-static inline sal_uInt32 readLE32( const sal_uInt8* pBuffer )
+static sal_uInt32 readLE32( const sal_uInt8* pBuffer )
{
//This is untainted data which comes from a controlled source
//so, using a byte-swapping pattern which coverity doesn't
@@ -83,7 +83,7 @@ static inline sal_uInt32 readLE32( const sal_uInt8* pBuffer )
* scanline helpers
*/
-static inline void X11_writeScanlinePixel( unsigned long nColor, sal_uInt8* pScanline, int depth, int x )
+static void X11_writeScanlinePixel( unsigned long nColor, sal_uInt8* pScanline, int depth, int x )
{
switch( depth )
{
@@ -194,12 +194,12 @@ static sal_uInt8* X11_getPaletteBmpFromImage(
return pBuffer;
}
-static inline unsigned long doRightShift( unsigned long nValue, int nShift )
+static unsigned long doRightShift( unsigned long nValue, int nShift )
{
return (nShift > 0) ? (nValue >> nShift) : (nValue << (-nShift));
}
-static inline unsigned long doLeftShift( unsigned long nValue, int nShift )
+static unsigned long doLeftShift( unsigned long nValue, int nShift )
{
return (nShift > 0) ? (nValue << nShift) : (nValue >> (-nShift));
}
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 7ea19def9e67..06ee4f180b1b 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -81,7 +81,7 @@ using namespace com::sun::star::lang;
* static helpers
*/
-static inline sal_uInt16 getUInt16BE( const sal_uInt8*& pBuffer )
+static sal_uInt16 getUInt16BE( const sal_uInt8*& pBuffer )
{
sal_uInt16 nRet = static_cast<sal_uInt16>(pBuffer[1]) |
(static_cast<sal_uInt16>(pBuffer[0]) << 8);
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index e1960f36dfb3..f008a0294df0 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -61,7 +61,7 @@ void GlyphCache::ClearFontOptions()
}
}
-static inline sal_IntPtr GetFontId(const LogicalFontInstance& rFontInstance)
+static sal_IntPtr GetFontId(const LogicalFontInstance& rFontInstance)
{
if (rFontInstance.GetFontFace())
return rFontInstance.GetFontFace()->GetFontId();
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index b7aabb648a6e..873abc28575f 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -138,9 +138,9 @@ namespace
}
}
-static inline int PtTo10Mu( int nPoints ) { return static_cast<int>((static_cast<double>(nPoints)*35.27777778)+0.5); }
+static int PtTo10Mu( int nPoints ) { return static_cast<int>((static_cast<double>(nPoints)*35.27777778)+0.5); }
-static inline int TenMuToPt( int nUnits ) { return static_cast<int>((static_cast<double>(nUnits)/35.27777778)+0.5); }
+static int TenMuToPt( int nUnits ) { return static_cast<int>((static_cast<double>(nUnits)/35.27777778)+0.5); }
static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
{
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 1ecbcdd5e5d5..560c7caf4af6 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2873,7 +2873,7 @@ struct KeyAlternate
KeyAlternate( sal_uInt16 nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
};
-static inline KeyAlternate
+static KeyAlternate
GetAlternateKeyCode( const sal_uInt16 nKeyCode )
{
KeyAlternate aAlternate;
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 620e34d928aa..aff9cee2d91e 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -164,7 +164,7 @@ action_wrapper_get_name (AtkAction *action,
* The keybindings in <full-path> should be separated by ":"
*/
-static inline void
+static void
appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rKeyStrokes)
{
for( sal_Int32 i = 0; i < rKeyStrokes.getLength(); i++ )
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index f5a5324b6680..91e526e0d3b8 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -23,7 +23,7 @@
using namespace ::com::sun::star;
-static inline AtkObject *
+static AtkObject *
atk_object_wrapper_conditional_ref( const uno::Reference< accessibility::XAccessible >& rxAccessible )
{
if( rxAccessible.is() )
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index b40598a65fd1..4facd6011646 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -170,8 +170,7 @@ get_value( const uno::Sequence< beans::PropertyValue >& rAttributeList,
#define get_weight_value( list, index ) get_value( list, index, Weight2String )
#define get_language_string( list, index ) get_value( list, index, Locale2String )
-static inline
-double toPoint(sal_Int16 n)
+static double toPoint(sal_Int16 n)
{
// 100th mm -> pt
return static_cast<double>(n * 72) / 2540;
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 63a9cc53a118..02bb04cc18b5 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -177,7 +177,7 @@ AtkStateType mapAtkState( sal_Int16 nState )
return type;
}
-static inline AtkRole getRoleForName( const gchar * name )
+static AtkRole getRoleForName( const gchar * name )
{
AtkRole ret = atk_role_for_name( name );
if( ATK_ROLE_INVALID == ret )
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 8b96ea38e577..195093551d81 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -348,7 +348,7 @@ struct KeyAlternate
KeyAlternate( sal_uInt16 nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
};
-static inline KeyAlternate
+static KeyAlternate
GetAlternateKeyCode( const sal_uInt16 nKeyCode )
{
KeyAlternate aAlternate;
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index ac188941d819..2889535dba05 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -450,7 +450,7 @@ void NWPixmapCacheList::ThemeChanged( )
/*********************************************************
* Make border manipulation easier
*********************************************************/
-static inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pSrc )
+static void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pSrc )
{
aDst.left = pSrc->left;
aDst.top = pSrc->top;
@@ -3683,7 +3683,7 @@ static tools::Rectangle NWGetToolbarRect( SalX11Screen nScreen,
/************************************************************************
* helper for GtkSalFrame
************************************************************************/
-static inline Color getColor( const GdkColor& rCol )
+static Color getColor( const GdkColor& rCol )
{
return Color( rCol.red >> 8, rCol.green >> 8, rCol.blue >> 8 );
}
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d957775cfc94..09725122c13f 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -351,7 +351,7 @@ struct KeyAlternate
KeyAlternate( sal_uInt16 nKey, sal_Unicode nChar = 0 ) : nKeyCode( nKey ), nCharCode( nChar ) {}
};
-static inline KeyAlternate
+static KeyAlternate
GetAlternateKeyCode( const sal_uInt16 nKeyCode )
{
KeyAlternate aAlternate;
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 17433d0a8f8e..98aa46f51efc 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2774,7 +2774,7 @@ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
/************************************************************************
* helper for GtkSalFrame
************************************************************************/
-static inline ::Color getColor( const GdkRGBA& rCol )
+static ::Color getColor( const GdkRGBA& rCol )
{
return ::Color( static_cast<int>(rCol.red * 0xFFFF) >> 8, static_cast<int>(rCol.green * 0xFFFF) >> 8, static_cast<int>(rCol.blue * 0xFFFF) >> 8 );
}
generated by cgit (git 2.34.1) at 2024-07-15 07:15:34 +0000