vcl/inc/qt5/Qt5Bitmap.hxx | 1 -
vcl/inc/qt5/Qt5Font.hxx | 3 ---
vcl/inc/qt5/Qt5FontFace.hxx | 2 --
vcl/inc/qt5/Qt5MainWindow.hxx | 1 -
vcl/inc/qt5/Qt5Menu.hxx | 1 -
vcl/inc/qt5/Qt5Object.hxx | 1 -
vcl/inc/qt5/Qt5System.hxx | 3 ---
vcl/inc/qt5/Qt5Timer.hxx | 1 -
vcl/inc/qt5/Qt5VirtualDevice.hxx | 1 -
vcl/inc/qt5/Qt5Widget.hxx | 1 -
vcl/qt5/Qt5Bitmap.cxx | 2 --
vcl/qt5/Qt5Data.cxx | 1 +
vcl/qt5/Qt5Font.cxx | 2 --
vcl/qt5/Qt5FontFace.cxx | 2 --
vcl/qt5/Qt5MainWindow.cxx | 2 --
vcl/qt5/Qt5Menu.cxx | 2 --
vcl/qt5/Qt5Object.cxx | 2 --
vcl/qt5/Qt5System.cxx | 3 ---
vcl/qt5/Qt5Timer.cxx | 2 --
vcl/qt5/Qt5VirtualDevice.cxx | 2 --
vcl/qt5/Qt5Widget.cxx | 2 --
21 files changed, 1 insertion(+), 36 deletions(-)
New commits:
commit 1ddbf5c37a472c72b3b2be23381e18a9f1ad5823
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Sep 4 22:56:38 2018 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Sep 5 08:07:59 2018 +0200
kde5: cleanup cargo-culted empty dtors
Change-Id: I8f987e30b2a78e173fd8f3ebb9f33e4720f6588b
Reviewed-on: https://gerrit.libreoffice.org/60011
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/vcl/inc/qt5/Qt5Bitmap.hxx b/vcl/inc/qt5/Qt5Bitmap.hxx
index c89038a28fb7..ba2ea5a2f58a 100644
--- a/vcl/inc/qt5/Qt5Bitmap.hxx
+++ b/vcl/inc/qt5/Qt5Bitmap.hxx
@@ -38,7 +38,6 @@ class VCL_DLLPUBLIC Qt5Bitmap : public SalBitmap
public:
Qt5Bitmap();
Qt5Bitmap(const QImage& rQImage);
- virtual ~Qt5Bitmap() override;
const QImage* GetQImage() const { return m_pImage.get(); }
diff --git a/vcl/inc/qt5/Qt5Font.hxx b/vcl/inc/qt5/Qt5Font.hxx
index 034cda35c2d4..de5cd16039f1 100644
--- a/vcl/inc/qt5/Qt5Font.hxx
+++ b/vcl/inc/qt5/Qt5Font.hxx
@@ -33,9 +33,6 @@ class Qt5Font final : public QFont, public LogicalFontInstance
virtual hb_font_t* ImplInitHbFont() override;
explicit Qt5Font(const PhysicalFontFace&, const FontSelectPattern&);
-
-public:
- virtual ~Qt5Font() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index c653b4be6f6e..4f8f968700f9 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
@@ -34,8 +34,6 @@ class QFont;
class Qt5FontFace : public PhysicalFontFace
{
public:
- virtual ~Qt5FontFace() override;
-
static Qt5FontFace* fromQFont(const QFont& rFont);
static void fillAttributesFromQFont(const QFont& rFont, FontAttributes&
rFA);
diff --git a/vcl/inc/qt5/Qt5MainWindow.hxx b/vcl/inc/qt5/Qt5MainWindow.hxx
index caac2299c4bc..a2a7e184c291 100644
--- a/vcl/inc/qt5/Qt5MainWindow.hxx
+++ b/vcl/inc/qt5/Qt5MainWindow.hxx
@@ -35,7 +35,6 @@ class Qt5MainWindow : public QMainWindow
public:
Qt5MainWindow(Qt5Frame& rFrame, QWidget* parent = Q_NULLPTR,
Qt::WindowFlags f = Qt::WindowFlags());
- virtual ~Qt5MainWindow() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 4b4081e09545..412a9d9798f0 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -67,7 +67,6 @@ class Qt5MenuItem : public SalMenuItem
{
public:
Qt5MenuItem(const SalItemParams*);
- virtual ~Qt5MenuItem() override;
sal_uInt16 mnId; // Item ID
MenuItemType mnType; // Item type
diff --git a/vcl/inc/qt5/Qt5Object.hxx b/vcl/inc/qt5/Qt5Object.hxx
index df62016aded1..ecfdbf7d37b2 100644
--- a/vcl/inc/qt5/Qt5Object.hxx
+++ b/vcl/inc/qt5/Qt5Object.hxx
@@ -38,7 +38,6 @@ class Qt5Object : public SalObject
public:
Qt5Object(Qt5Frame* pParent, bool bShow);
- virtual ~Qt5Object() override;
virtual void ResetClipRegion() override;
virtual void BeginSetClipRegion(sal_uLong nRects) override;
diff --git a/vcl/inc/qt5/Qt5System.hxx b/vcl/inc/qt5/Qt5System.hxx
index fbc753757b36..0d51bb29f358 100644
--- a/vcl/inc/qt5/Qt5System.hxx
+++ b/vcl/inc/qt5/Qt5System.hxx
@@ -15,9 +15,6 @@
class Qt5System : public SalGenericSystem
{
public:
- Qt5System();
- virtual ~Qt5System() override;
-
virtual unsigned int GetDisplayScreenCount() override;
virtual tools::Rectangle GetDisplayScreenPosSizePixel(unsigned int
nScreen) override;
virtual int ShowNativeDialog(const OUString& rTitle, const OUString&
rMessage,
diff --git a/vcl/inc/qt5/Qt5Timer.hxx b/vcl/inc/qt5/Qt5Timer.hxx
index 74f9ea712019..43613d8cf4a1 100644
--- a/vcl/inc/qt5/Qt5Timer.hxx
+++ b/vcl/inc/qt5/Qt5Timer.hxx
@@ -37,7 +37,6 @@ Q_SIGNALS:
public:
Qt5Timer();
- virtual ~Qt5Timer() override;
virtual void Start(sal_uIntPtr nMS) override;
virtual void Stop() override;
diff --git a/vcl/inc/qt5/Qt5VirtualDevice.hxx b/vcl/inc/qt5/Qt5VirtualDevice.hxx
index 80ed0fcf92d1..465b84ade045 100644
--- a/vcl/inc/qt5/Qt5VirtualDevice.hxx
+++ b/vcl/inc/qt5/Qt5VirtualDevice.hxx
@@ -40,7 +40,6 @@ class Qt5VirtualDevice : public SalVirtualDevice
public:
Qt5VirtualDevice(DeviceFormat eFormat, double fScale);
- virtual ~Qt5VirtualDevice() override;
// SalVirtualDevice
virtual SalGraphics* AcquireGraphics() override;
diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index 19bbb9ff9e55..ba558f82be38 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -57,7 +57,6 @@ class Qt5Widget : public QWidget
public:
Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags());
- virtual ~Qt5Widget() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index b8e8e4bdf159..eb2037c214c8 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -31,8 +31,6 @@ Qt5Bitmap::Qt5Bitmap() {}
Qt5Bitmap::Qt5Bitmap(const QImage& rImage) { m_pImage.reset(new
QImage(rImage)); }
-Qt5Bitmap::~Qt5Bitmap() {}
-
bool Qt5Bitmap::Create(const Size& rSize, sal_uInt16 nBitCount, const
BitmapPalette& rPal)
{
assert((nBitCount == 1 || nBitCount == 4 || nBitCount == 8 || nBitCount ==
16 || nBitCount == 24
diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/Qt5Data.cxx
index c8f7e4a7570b..74ba881ea15a 100644
--- a/vcl/qt5/Qt5Data.cxx
+++ b/vcl/qt5/Qt5Data.cxx
@@ -161,6 +161,7 @@ Qt5Data::Qt5Data(SalInstance* pInstance)
pSVData->maNWFData.mbDockingAreaSeparateTB = true;
}
+// outline dtor b/c of GlyphCache incomplete type
Qt5Data::~Qt5Data() {}
static QCursor* getQCursorFromXBM(const unsigned char* pBitmap, const unsigned
char* pMask,
diff --git a/vcl/qt5/Qt5Font.cxx b/vcl/qt5/Qt5Font.cxx
index dc393dd1cae8..60287d9a6093 100644
--- a/vcl/qt5/Qt5Font.cxx
+++ b/vcl/qt5/Qt5Font.cxx
@@ -78,8 +78,6 @@ Qt5Font::Qt5Font(const PhysicalFontFace& rPFF, const
FontSelectPattern& rFSP)
}
}
-Qt5Font::~Qt5Font() {}
-
static hb_blob_t* getFontTable(hb_face_t*, hb_tag_t nTableTag, void* pUserData)
{
char pTagName[5];
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx
index 10f79aa559bd..50a73b91c4df 100644
--- a/vcl/qt5/Qt5FontFace.cxx
+++ b/vcl/qt5/Qt5FontFace.cxx
@@ -112,8 +112,6 @@ Qt5FontFace::Qt5FontFace(const FontAttributes& rFA, const
QString& rFontID)
{
}
-Qt5FontFace::~Qt5FontFace() {}
-
sal_IntPtr Qt5FontFace::GetFontId() const { return
reinterpret_cast<sal_IntPtr>(&m_aFontId); }
rtl::Reference<LogicalFontInstance>
diff --git a/vcl/qt5/Qt5MainWindow.cxx b/vcl/qt5/Qt5MainWindow.cxx
index da3df1b179f9..e49e49aaeaf1 100644
--- a/vcl/qt5/Qt5MainWindow.cxx
+++ b/vcl/qt5/Qt5MainWindow.cxx
@@ -19,8 +19,6 @@ Qt5MainWindow::Qt5MainWindow(Qt5Frame& rFrame, QWidget*
parent, Qt::WindowFlags
{
}
-Qt5MainWindow::~Qt5MainWindow() {}
-
void Qt5MainWindow::closeEvent(QCloseEvent* pEvent)
{
bool bRet = false;
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index b728f0b30160..7e7b5a5195a9 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -199,6 +199,4 @@ Qt5MenuItem::Qt5MenuItem(const SalItemParams* pItemData)
{
}
-Qt5MenuItem::~Qt5MenuItem() {}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx
index eb31301ccf5e..b88f3047b391 100644
--- a/vcl/qt5/Qt5Object.cxx
+++ b/vcl/qt5/Qt5Object.cxx
@@ -33,8 +33,6 @@ Qt5Object::Qt5Object(Qt5Frame* pParent, bool bShow)
m_pQWidget->show();
}
-Qt5Object::~Qt5Object() {}
-
void Qt5Object::ResetClipRegion()
{
if (m_pQWidget.get())
diff --git a/vcl/qt5/Qt5System.cxx b/vcl/qt5/Qt5System.cxx
index ca533923913b..283fe58dc84d 100644
--- a/vcl/qt5/Qt5System.cxx
+++ b/vcl/qt5/Qt5System.cxx
@@ -15,9 +15,6 @@
#include <Qt5System.hxx>
#include <Qt5Tools.hxx>
-Qt5System::Qt5System() {}
-Qt5System::~Qt5System() {}
-
unsigned int Qt5System::GetDisplayScreenCount() { return
QApplication::desktop()->screenCount(); }
tools::Rectangle Qt5System::GetDisplayScreenPosSizePixel(unsigned int nScreen)
diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx
index 56dec31d7d31..6a9faf829342 100644
--- a/vcl/qt5/Qt5Timer.cxx
+++ b/vcl/qt5/Qt5Timer.cxx
@@ -34,8 +34,6 @@ Qt5Timer::Qt5Timer()
connect(this, SIGNAL(startTimerSignal()), this, SLOT(startTimer()),
Qt::QueuedConnection);
}
-Qt5Timer::~Qt5Timer() {}
-
void Qt5Timer::timeoutActivated()
{
SolarMutexGuard aGuard;
diff --git a/vcl/qt5/Qt5VirtualDevice.cxx b/vcl/qt5/Qt5VirtualDevice.cxx
index c1ab6a0b5cdb..a26ec627bea5 100644
--- a/vcl/qt5/Qt5VirtualDevice.cxx
+++ b/vcl/qt5/Qt5VirtualDevice.cxx
@@ -30,8 +30,6 @@ Qt5VirtualDevice::Qt5VirtualDevice(DeviceFormat eFormat,
double fScale)
{
}
-Qt5VirtualDevice::~Qt5VirtualDevice() {}
-
SalGraphics* Qt5VirtualDevice::AcquireGraphics()
{
assert(m_pImage);
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 3e90a94d4501..00ab29744a67 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -362,6 +362,4 @@ Qt5Widget::Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f)
setFocusPolicy(Qt::StrongFocus);
}
-Qt5Widget::~Qt5Widget(){};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
