summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-18 14:30:24 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-20 08:07:53 +0000
commit72edb6967f245f0c99c6a61e0ce8d0a245600cba (patch)
tree5608bc1243477801e747735d8b71ec42fbb01e86 /vcl/inc/unx
parentaad5eced795c60f873b67fe97baeefb9ef1bfef8 (diff)
loplugin:unusedmethods in vcl
also drops the CairoFontsCache ref-counting, since nothing was actually using it. Change-Id: If05ecb054b6b8d97b0d3010185cf23c28390ec04 Reviewed-on: https://gerrit.libreoffice.org/25105 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/cairotextrender.hxx4
-rw-r--r--vcl/inc/unx/fc_fontoptions.hxx7
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx2
-rw-r--r--vcl/inc/unx/i18n_ic.hxx5
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx4
-rw-r--r--vcl/inc/unx/salmenu.h56
6 files changed, 2 insertions, 76 deletions
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 14b35031b5b7..612daaede16d 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -51,12 +51,10 @@ public:
};
private:
- static int mnRefCount;
typedef std::deque< std::pair<void *, CacheId> > LRUFonts;
static LRUFonts maLRUFonts;
public:
- CairoFontsCache();
- ~CairoFontsCache();
+ CairoFontsCache() = delete;
static void CacheFont(void *pFont, const CacheId &rId);
static void* FindCachedFont(const CacheId &rId);
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index f831ef57531b..d99870d1b6df 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -37,13 +37,6 @@ public:
FontHinting meHinting; // whether the font should be hinted
FontHintStyle meHintStyle; // type of font hinting to be used
- FontConfigFontOptions() :
- meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
- meAntiAlias(ANTIALIAS_DONTKNOW),
- meAutoHint(AUTOHINT_DONTKNOW),
- meHinting(HINTING_DONTKNOW),
- meHintStyle(HINT_SLIGHT),
- mpPattern(nullptr) {}
FontConfigFontOptions(FcPattern* pPattern) :
meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
meAntiAlias(ANTIALIAS_DONTKNOW),
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 84696597bbc6..1a5cd0ad1fcc 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -18,7 +18,7 @@
#include <gio/gio.h>
#endif
-#include <unx/salmenu.h>
+#include <salmenu.hxx>
#include <unx/gtk/gtkframe.hxx>
#include <vcl/idle.hxx>
diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index 4410d58590ff..e6125909abf0 100644
--- a/vcl/inc/unx/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
@@ -75,11 +75,6 @@ public:
SalI18N_InputContext( SalFrame *aFrame );
~SalI18N_InputContext();
-
-private:
-
- SalI18N_InputContext(); // do not use this
-
};
#endif // INCLUDED_VCL_INC_UNX_I18N_IC_HXX
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 0e6999261507..763e8a2b5c5d 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -46,10 +46,6 @@ public:
void Dispatch( XEvent *pEvent ); // keep track of group changes
inline int GetEventBase() const ;
-
-protected:
-
- SalI18N_KeyboardExtension(); // disabled
};
inline
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
deleted file mode 100644
index 9d43a10ff0f2..000000000000
--- a/vcl/inc/unx/salmenu.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_VCL_INC_UNX_SALMENU_H
-#define INCLUDED_VCL_INC_UNX_SALMENU_H
-
-#include <vcl/bitmap.hxx>
-#include <salmenu.hxx>
-
-class X11SalMenu : public SalMenu
-{
-public:
- X11SalMenu() {}
- virtual ~X11SalMenu();
-
- virtual bool VisibleMenuBar() override; // must return TRUE to actually DISPLAY native menu bars
- // otherwise only menu messages are processed (eg, OLE on Windows)
-
- virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
- virtual void RemoveItem( unsigned nPos ) override;
- virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) override;
- virtual void SetFrame( const SalFrame* pFrame ) override;
- virtual void CheckItem( unsigned nPos, bool bCheck ) override;
- virtual void EnableItem( unsigned nPos, bool bEnable ) override;
- virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ) override;
- virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override;
- virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
- virtual void GetSystemMenuData( SystemMenuData* pData ) override;
-};
-
-class X11SalMenuItem : public SalMenuItem
-{
-public:
- X11SalMenuItem() {}
- virtual ~X11SalMenuItem();
-};
-
-#endif // INCLUDED_VCL_INC_UNX_SALMENU_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */