vcl/inc/qt5/Qt5FilePicker.hxx | 2 +-
vcl/qt5/Qt5Bitmap.cxx | 6 +++---
vcl/qt5/Qt5Data.cxx | 2 +-
vcl/qt5/Qt5FilePicker.cxx | 12 ++++++------
vcl/qt5/Qt5Font.hxx | 2 +-
vcl/qt5/Qt5FontFace.cxx | 4 ++--
vcl/qt5/Qt5Frame.cxx | 12 ++++++------
vcl/qt5/Qt5Graphics.cxx | 6 +++---
vcl/qt5/Qt5Graphics_Controls.cxx | 2 +-
vcl/qt5/Qt5Graphics_GDI.cxx | 6 +++---
vcl/qt5/Qt5Graphics_Text.cxx | 6 +++---
vcl/qt5/Qt5Instance.cxx | 18 +++++++++---------
vcl/qt5/Qt5Instance_Print.cxx | 4 ++--
vcl/qt5/Qt5Menu.cxx | 23 ++++++++++-------------
vcl/qt5/Qt5Object.cxx | 4 ++--
vcl/qt5/Qt5Painter.cxx | 2 +-
vcl/qt5/Qt5Printer.cxx | 2 +-
vcl/qt5/Qt5Timer.cxx | 2 +-
vcl/qt5/Qt5Tools.cxx | 2 +-
vcl/qt5/Qt5VirtualDevice.cxx | 6 +++---
vcl/qt5/Qt5Widget.cxx | 8 ++++----
21 files changed, 64 insertions(+), 67 deletions(-)
New commits:
commit 9a865aa2880b28953e313389e44974dab88e535b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 1 15:28:26 2018 +0200
Various trivial loplugin fixes in --enable-qt5
Change-Id: I9539eb77f663e1174919ae801495801f81571710
diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index 9133c4353295..e1cb95344987 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -119,7 +119,7 @@ public:
// XEventListener
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent);
+ virtual void disposing(const css::lang::EventObject& rEvent);
using cppu::WeakComponentImplHelperBase::disposing;
// XServiceInfo
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index 7ec43af5179b..ff44143a16f2 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Bitmap.hxx"
-#include "Qt5Tools.hxx"
-#include "Qt5Graphics.hxx"
+#include <Qt5Bitmap.hxx>
+#include <Qt5Tools.hxx>
+#include <Qt5Graphics.hxx>
#include <QtGui/QImage>
#include <QtCore/QVector>
diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/Qt5Data.cxx
index e2eabefe6871..350db44c3c16 100644
--- a/vcl/qt5/Qt5Data.cxx
+++ b/vcl/qt5/Qt5Data.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Data.hxx"
+#include <Qt5Data.hxx>
#include <QtGui/QCursor>
#include <QtGui/QBitmap>
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 7bc561a7d594..1ffa1b993756 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5FilePicker.hxx"
+#include <Qt5FilePicker.hxx>
#include <Qt5FilePicker.moc>
-#include "Qt5Frame.hxx"
-#include "Qt5Tools.hxx"
-#include "Qt5Widget.hxx"
+#include <Qt5Frame.hxx>
+#include <Qt5Tools.hxx>
+#include <Qt5Widget.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno;
namespace
{
-uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
+uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
{
uno::Sequence<OUString> aRet(3);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
@@ -750,7 +750,7 @@ void SAL_CALL Qt5FilePicker::initialize(const
uno::Sequence<uno::Any>& args)
void SAL_CALL Qt5FilePicker::cancel() {}
-void SAL_CALL Qt5FilePicker::disposing(const lang::EventObject& rEvent)
+void Qt5FilePicker::disposing(const lang::EventObject& rEvent)
{
uno::Reference<XFilePickerListener> xFilePickerListener(rEvent.Source,
uno::UNO_QUERY);
diff --git a/vcl/qt5/Qt5Font.hxx b/vcl/qt5/Qt5Font.hxx
index fd496348c9b6..4e37f7d28bdd 100644
--- a/vcl/qt5/Qt5Font.hxx
+++ b/vcl/qt5/Qt5Font.hxx
@@ -23,7 +23,7 @@
#include <QtGui/QFont>
-#include "Qt5FontFace.hxx"
+#include <Qt5FontFace.hxx>
class Qt5Font final : public QFont, public LogicalFontInstance
{
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx
index b7a0f0b12f9e..ade0f1c95c72 100644
--- a/vcl/qt5/Qt5FontFace.cxx
+++ b/vcl/qt5/Qt5FontFace.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5FontFace.hxx"
+#include <Qt5FontFace.hxx>
#include "Qt5Font.hxx"
-#include "Qt5Tools.hxx"
+#include <Qt5Tools.hxx>
#include <sft.hxx>
#include <impfontcharmap.hxx>
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index e86e10d15f43..9c5b8edbc5be 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Frame.hxx"
+#include <Qt5Frame.hxx>
-#include "Qt5Tools.hxx"
-#include "Qt5Instance.hxx"
-#include "Qt5Graphics.hxx"
-#include "Qt5Widget.hxx"
-#include "Qt5Data.hxx"
+#include <Qt5Tools.hxx>
+#include <Qt5Instance.hxx>
+#include <Qt5Graphics.hxx>
+#include <Qt5Widget.hxx>
+#include <Qt5Data.hxx>
#include <Qt5Menu.hxx>
#include <QtCore/QPoint>
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 8bf37adddff8..c7ca69a8a606 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Graphics.hxx"
+#include <Qt5Graphics.hxx>
#include "Qt5Font.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Painter.hxx"
+#include <Qt5Frame.hxx>
+#include <Qt5Painter.hxx>
#include <QtGui/QImage>
#include <QtGui/QPainter>
diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx
index ca064ece5e13..11a1decc58aa 100644
--- a/vcl/qt5/Qt5Graphics_Controls.cxx
+++ b/vcl/qt5/Qt5Graphics_Controls.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Graphics.hxx"
+#include <Qt5Graphics.hxx>
bool Qt5Graphics::IsNativeControlSupported(ControlType /*nType*/, ControlPart
/*nPart*/)
{
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index 61b92b109bfe..43e54b8b1385 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Graphics.hxx"
+#include <Qt5Graphics.hxx>
-#include "Qt5Bitmap.hxx"
-#include "Qt5Painter.hxx"
+#include <Qt5Bitmap.hxx>
+#include <Qt5Painter.hxx>
#include <QtGui/QPainter>
#include <QtGui/QScreen>
diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
index e5fc79e0445b..cf244d3f4d78 100644
--- a/vcl/qt5/Qt5Graphics_Text.cxx
+++ b/vcl/qt5/Qt5Graphics_Text.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Graphics.hxx"
-#include "Qt5FontFace.hxx"
+#include <Qt5Graphics.hxx>
+#include <Qt5FontFace.hxx>
#include "Qt5Font.hxx"
-#include "Qt5Painter.hxx"
+#include <Qt5Painter.hxx>
#include <vcl/fontcharmap.hxx>
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 6cc083f8f865..7551a1f0721c 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -17,17 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Instance.hxx"
+#include <Qt5Instance.hxx>
#include <Qt5Instance.moc>
-#include "Qt5Bitmap.hxx"
-#include "Qt5Data.hxx"
-#include "Qt5FilePicker.hxx"
-#include "Qt5Frame.hxx"
-#include "Qt5Menu.hxx"
-#include "Qt5Object.hxx"
-#include "Qt5Timer.hxx"
-#include "Qt5VirtualDevice.hxx"
+#include <Qt5Bitmap.hxx>
+#include <Qt5Data.hxx>
+#include <Qt5FilePicker.hxx>
+#include <Qt5Frame.hxx>
+#include <Qt5Menu.hxx>
+#include <Qt5Object.hxx>
+#include <Qt5Timer.hxx>
+#include <Qt5VirtualDevice.hxx>
#include <headless/svpvd.hxx>
diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/Qt5Instance_Print.cxx
index 802f2591ccfe..a0bfed1d2f9f 100644
--- a/vcl/qt5/Qt5Instance_Print.cxx
+++ b/vcl/qt5/Qt5Instance_Print.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Instance.hxx"
-#include "Qt5Printer.hxx"
+#include <Qt5Instance.hxx>
+#include <Qt5Printer.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index ce95da1a94d7..d4f0763d00f2 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "Qt5Frame.hxx"
-#include "Qt5Menu.hxx"
+#include <Qt5Frame.hxx>
+#include <Qt5Menu.hxx>
#include <Qt5Menu.moc>
#include <QtWidgets/QtWidgets>
@@ -46,7 +46,7 @@ void Qt5Menu::RemoveItem(unsigned nPos)
maItems.erase(maItems.begin() + nPos);
}
-void Qt5Menu::SetSubMenu(SalMenuItem* pSalMenuItem, SalMenu* pSubMenu,
unsigned nPos)
+void Qt5Menu::SetSubMenu(SalMenuItem* pSalMenuItem, SalMenu* pSubMenu,
unsigned)
{
SolarMutexGuard aGuard;
Qt5MenuItem* pItem = static_cast<Qt5MenuItem*>(pSalMenuItem);
@@ -146,22 +146,19 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu*
pParentMenu)
}
}
-void Qt5Menu::ShowItem(unsigned nPos, bool bCheck) {}
+void Qt5Menu::ShowItem(unsigned, bool) {}
-void Qt5Menu::CheckItem(unsigned nPos, bool bCheck) {}
+void Qt5Menu::CheckItem(unsigned, bool) {}
-void Qt5Menu::EnableItem(unsigned nPos, bool bEnable) {}
+void Qt5Menu::EnableItem(unsigned, bool) {}
-void Qt5Menu::SetItemText(unsigned nPos, SalMenuItem* pSalMenuItem, const
rtl::OUString& rText) {}
+void Qt5Menu::SetItemText(unsigned, SalMenuItem*, const rtl::OUString&) {}
-void Qt5Menu::SetItemImage(unsigned nPos, SalMenuItem* pSalMenuItem, const
Image& rImage) {}
+void Qt5Menu::SetItemImage(unsigned, SalMenuItem*, const Image&) {}
-void Qt5Menu::SetAccelerator(unsigned nPos, SalMenuItem* pSalMenuItem, const
vcl::KeyCode& rKeyCode,
- const OUString& rKeyName)
-{
-}
+void Qt5Menu::SetAccelerator(unsigned, SalMenuItem*, const vcl::KeyCode&,
const OUString&) {}
-void Qt5Menu::GetSystemMenuData(SystemMenuData* pData) {}
+void Qt5Menu::GetSystemMenuData(SystemMenuData*) {}
Qt5Menu* Qt5Menu::GetTopLevel()
{
diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/Qt5Object.cxx
index d00f3fc14719..eb31301ccf5e 100644
--- a/vcl/qt5/Qt5Object.cxx
+++ b/vcl/qt5/Qt5Object.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Object.hxx"
+#include <Qt5Object.hxx>
-#include "Qt5Frame.hxx"
+#include <Qt5Frame.hxx>
#include <QtWidgets/QWidget>
diff --git a/vcl/qt5/Qt5Painter.cxx b/vcl/qt5/Qt5Painter.cxx
index 88e9b10b1885..7fa5c40f7e87 100644
--- a/vcl/qt5/Qt5Painter.cxx
+++ b/vcl/qt5/Qt5Painter.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Painter.hxx"
+#include <Qt5Painter.hxx>
#include <QtGui/QColor>
diff --git a/vcl/qt5/Qt5Printer.cxx b/vcl/qt5/Qt5Printer.cxx
index 34fce3da5984..a62cb925c592 100644
--- a/vcl/qt5/Qt5Printer.cxx
+++ b/vcl/qt5/Qt5Printer.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Printer.hxx"
+#include <Qt5Printer.hxx>
bool Qt5InfoPrinter::Setup(weld::Window*, ImplJobSetup*) { return false; }
diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/Qt5Timer.cxx
index a43a876fdb8d..2fa07886f60f 100644
--- a/vcl/qt5/Qt5Timer.cxx
+++ b/vcl/qt5/Qt5Timer.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Timer.hxx"
+#include <Qt5Timer.hxx>
#include <Qt5Timer.moc>
#include <QtWidgets/QApplication>
diff --git a/vcl/qt5/Qt5Tools.cxx b/vcl/qt5/Qt5Tools.cxx
index dc809675e790..54ac3f99e26f 100644
--- a/vcl/qt5/Qt5Tools.cxx
+++ b/vcl/qt5/Qt5Tools.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Tools.hxx"
+#include <Qt5Tools.hxx>
#include <cairo.h>
diff --git a/vcl/qt5/Qt5VirtualDevice.cxx b/vcl/qt5/Qt5VirtualDevice.cxx
index fc0c66232853..c1ab6a0b5cdb 100644
--- a/vcl/qt5/Qt5VirtualDevice.cxx
+++ b/vcl/qt5/Qt5VirtualDevice.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5VirtualDevice.hxx"
+#include <Qt5VirtualDevice.hxx>
-#include "Qt5Graphics.hxx"
-#include "Qt5Tools.hxx"
+#include <Qt5Graphics.hxx>
+#include <Qt5Tools.hxx>
#include <QtGui/QImage>
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 7dc2e17d6e79..8c62280d3f99 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "Qt5Widget.hxx"
+#include <Qt5Widget.hxx>
#include <Qt5Widget.moc>
-#include "Qt5Frame.hxx"
-#include "Qt5Graphics.hxx"
-#include "Qt5Tools.hxx"
+#include <Qt5Frame.hxx>
+#include <Qt5Graphics.hxx>
+#include <Qt5Tools.hxx>
#include <QtGui/QFocusEvent>
#include <QtGui/QImage>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
