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

Various trivial loplugin fixes in --enable-qt5

Change-Id: I9539eb77f663e1174919ae801495801f81571710
üst 1cfe22ff
...@@ -119,7 +119,7 @@ public: ...@@ -119,7 +119,7 @@ public:
// XEventListener // XEventListener
/// @throws css::uno::RuntimeException /// @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; using cppu::WeakComponentImplHelperBase::disposing;
// XServiceInfo // XServiceInfo
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Bitmap.hxx" #include <Qt5Bitmap.hxx>
#include "Qt5Tools.hxx" #include <Qt5Tools.hxx>
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtCore/QVector> #include <QtCore/QVector>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Data.hxx" #include <Qt5Data.hxx>
#include <QtGui/QCursor> #include <QtGui/QCursor>
#include <QtGui/QBitmap> #include <QtGui/QBitmap>
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5FilePicker.hxx" #include <Qt5FilePicker.hxx>
#include <Qt5FilePicker.moc> #include <Qt5FilePicker.moc>
#include "Qt5Frame.hxx" #include <Qt5Frame.hxx>
#include "Qt5Tools.hxx" #include <Qt5Tools.hxx>
#include "Qt5Widget.hxx" #include <Qt5Widget.hxx>
#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
...@@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno; ...@@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno;
namespace namespace
{ {
uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames() uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
{ {
uno::Sequence<OUString> aRet(3); uno::Sequence<OUString> aRet(3);
aRet[0] = "com.sun.star.ui.dialogs.FilePicker"; aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
...@@ -750,7 +750,7 @@ void SAL_CALL Qt5FilePicker::initialize(const uno::Sequence<uno::Any>& args) ...@@ -750,7 +750,7 @@ void SAL_CALL Qt5FilePicker::initialize(const uno::Sequence<uno::Any>& args)
void SAL_CALL Qt5FilePicker::cancel() {} 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); uno::Reference<XFilePickerListener> xFilePickerListener(rEvent.Source, uno::UNO_QUERY);
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <QtGui/QFont> #include <QtGui/QFont>
#include "Qt5FontFace.hxx" #include <Qt5FontFace.hxx>
class Qt5Font final : public QFont, public LogicalFontInstance class Qt5Font final : public QFont, public LogicalFontInstance
{ {
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5FontFace.hxx" #include <Qt5FontFace.hxx>
#include "Qt5Font.hxx" #include "Qt5Font.hxx"
#include "Qt5Tools.hxx" #include <Qt5Tools.hxx>
#include <sft.hxx> #include <sft.hxx>
#include <impfontcharmap.hxx> #include <impfontcharmap.hxx>
......
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Frame.hxx" #include <Qt5Frame.hxx>
#include "Qt5Tools.hxx" #include <Qt5Tools.hxx>
#include "Qt5Instance.hxx" #include <Qt5Instance.hxx>
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
#include "Qt5Widget.hxx" #include <Qt5Widget.hxx>
#include "Qt5Data.hxx" #include <Qt5Data.hxx>
#include <Qt5Menu.hxx> #include <Qt5Menu.hxx>
#include <QtCore/QPoint> #include <QtCore/QPoint>
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
#include "Qt5Font.hxx" #include "Qt5Font.hxx"
#include "Qt5Frame.hxx" #include <Qt5Frame.hxx>
#include "Qt5Painter.hxx" #include <Qt5Painter.hxx>
#include <QtGui/QImage> #include <QtGui/QImage>
#include <QtGui/QPainter> #include <QtGui/QPainter>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
bool Qt5Graphics::IsNativeControlSupported(ControlType /*nType*/, ControlPart /*nPart*/) bool Qt5Graphics::IsNativeControlSupported(ControlType /*nType*/, ControlPart /*nPart*/)
{ {
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
#include "Qt5Bitmap.hxx" #include <Qt5Bitmap.hxx>
#include "Qt5Painter.hxx" #include <Qt5Painter.hxx>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QScreen> #include <QtGui/QScreen>
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
#include "Qt5FontFace.hxx" #include <Qt5FontFace.hxx>
#include "Qt5Font.hxx" #include "Qt5Font.hxx"
#include "Qt5Painter.hxx" #include <Qt5Painter.hxx>
#include <vcl/fontcharmap.hxx> #include <vcl/fontcharmap.hxx>
......
...@@ -17,17 +17,17 @@ ...@@ -17,17 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Instance.hxx" #include <Qt5Instance.hxx>
#include <Qt5Instance.moc> #include <Qt5Instance.moc>
#include "Qt5Bitmap.hxx" #include <Qt5Bitmap.hxx>
#include "Qt5Data.hxx" #include <Qt5Data.hxx>
#include "Qt5FilePicker.hxx" #include <Qt5FilePicker.hxx>
#include "Qt5Frame.hxx" #include <Qt5Frame.hxx>
#include "Qt5Menu.hxx" #include <Qt5Menu.hxx>
#include "Qt5Object.hxx" #include <Qt5Object.hxx>
#include "Qt5Timer.hxx" #include <Qt5Timer.hxx>
#include "Qt5VirtualDevice.hxx" #include <Qt5VirtualDevice.hxx>
#include <headless/svpvd.hxx> #include <headless/svpvd.hxx>
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Instance.hxx" #include <Qt5Instance.hxx>
#include "Qt5Printer.hxx" #include <Qt5Printer.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include "Qt5Frame.hxx" #include <Qt5Frame.hxx>
#include "Qt5Menu.hxx" #include <Qt5Menu.hxx>
#include <Qt5Menu.moc> #include <Qt5Menu.moc>
#include <QtWidgets/QtWidgets> #include <QtWidgets/QtWidgets>
...@@ -46,7 +46,7 @@ void Qt5Menu::RemoveItem(unsigned nPos) ...@@ -46,7 +46,7 @@ void Qt5Menu::RemoveItem(unsigned nPos)
maItems.erase(maItems.begin() + 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; SolarMutexGuard aGuard;
Qt5MenuItem* pItem = static_cast<Qt5MenuItem*>(pSalMenuItem); Qt5MenuItem* pItem = static_cast<Qt5MenuItem*>(pSalMenuItem);
...@@ -146,22 +146,19 @@ void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu) ...@@ -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, void Qt5Menu::SetAccelerator(unsigned, SalMenuItem*, const vcl::KeyCode&, const OUString&) {}
const OUString& rKeyName)
{
}
void Qt5Menu::GetSystemMenuData(SystemMenuData* pData) {} void Qt5Menu::GetSystemMenuData(SystemMenuData*) {}
Qt5Menu* Qt5Menu::GetTopLevel() Qt5Menu* Qt5Menu::GetTopLevel()
{ {
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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> #include <QtWidgets/QWidget>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Painter.hxx" #include <Qt5Painter.hxx>
#include <QtGui/QColor> #include <QtGui/QColor>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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; } bool Qt5InfoPrinter::Setup(weld::Window*, ImplJobSetup*) { return false; }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Timer.hxx" #include <Qt5Timer.hxx>
#include <Qt5Timer.moc> #include <Qt5Timer.moc>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Tools.hxx" #include <Qt5Tools.hxx>
#include <cairo.h> #include <cairo.h>
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5VirtualDevice.hxx" #include <Qt5VirtualDevice.hxx>
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
#include "Qt5Tools.hxx" #include <Qt5Tools.hxx>
#include <QtGui/QImage> #include <QtGui/QImage>
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "Qt5Widget.hxx" #include <Qt5Widget.hxx>
#include <Qt5Widget.moc> #include <Qt5Widget.moc>
#include "Qt5Frame.hxx" #include <Qt5Frame.hxx>
#include "Qt5Graphics.hxx" #include <Qt5Graphics.hxx>
#include "Qt5Tools.hxx" #include <Qt5Tools.hxx>
#include <QtGui/QFocusEvent> #include <QtGui/QFocusEvent>
#include <QtGui/QImage> #include <QtGui/QImage>
......
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