koffice
Thomas Zander <zander <at> kde.org>
2010-08-02 22:21:57 GMT
SVN commit 1158520 by zander:
Make setCursor consistent and remove unused return value
CCMAIL: koffice-devel <at> kde.org
the setCursor method exists on several Qt classes and nowhere
does it return anything; so lets follow that example since
nobody in KOffice svn was using the return value anyway.
Also fix the problem that in kspread the new method ended up
being a slot.
M +2 -3 karbon/ui/widgets/KarbonCanvas.cpp
M +1 -1 karbon/ui/widgets/KarbonCanvas.h
M +1 -3 kformula/KFormulaCanvas.cpp
M +1 -1 kformula/KFormulaCanvas.h
M +1 -6 kformula/flake/tests/TestCursor.cpp
M +2 -3 krita/plugins/extensions/painterlyframework/mixercanvas.cpp
M +1 -1 krita/plugins/extensions/painterlyframework/mixercanvas.h
M +1 -3 krita/ui/canvas/kis_canvas2.cpp
M +1 -1 krita/ui/canvas/kis_canvas2.h
M +1 -1 krita/ui/flake/kis_shape_layer_canvas.h
M +1 -4 krita/ui/flake/kis_shape_selection_canvas.h
M +2 -3 kspread/part/Canvas.cpp
M +2 -2 kspread/part/Canvas.h
M +1 -3 kspread/part/CanvasItem.cpp
M +1 -1 kspread/part/CanvasItem.h
M +1 -3 kword/part/KWCanvas.cpp
M +1 -1 kword/part/KWCanvas.h
M +1 -3 kword/part/KWCanvasItem.cpp
M +1 -1 kword/part/KWCanvasItem.h
M +1 -1 libs/flake/KoCanvasBase.h
M +1 -4 libs/flake/KoShapePainter.cpp
M +1 -4 libs/flake/tests/MockShapes.h
M +1 -3 libs/kopageapp/KoPACanvas.cpp
M +1 -1 libs/kopageapp/KoPACanvas.h
M +3 -1 plugins/dockers/shapeselector/Canvas.h
--- trunk/koffice/karbon/ui/widgets/KarbonCanvas.cpp #1158519:1158520
<at> <at> -420,11 +420,10 <at> <at>
setPalette(pal);
}
-QCursor KarbonCanvas::setCursor(const QCursor &cursor)
+void KarbonCanvas::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QWidget::cursor();
QWidget::setCursor(cursor);
- return oldCursor;
}
+
#include "KarbonCanvas.moc"
--- trunk/koffice/karbon/ui/widgets/KarbonCanvas.h #1158519:1158520
<at> <at> -85,7 +85,7 <at> <at>
virtual void updateInputMethodInfo();
/// reimplemented from KoCanvasBase
virtual KoGuidesData * guidesData();
- virtual QCursor setCursor(const QCursor &cursor);
+ virtual void setCursor(const QCursor &cursor);
/// Enables/disables showing page margins
void setShowPageMargins(bool on);
--- trunk/koffice/kformula/KFormulaCanvas.cpp #1158519:1158520
<at> <at> -157,9 +157,7 <at> <at>
updateMicroFocus();
}
-QCursor KFormulaCanvas::setCursor(const QCursor &cursor)
+void KFormulaCanvas::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QWidget::cursor();
QWidget::setCursor(cursor);
- return oldCursor;
}
--- trunk/koffice/kformula/KFormulaCanvas.h #1158519:1158520
<at> <at> -78,7 +78,7 <at> <at>
/// reimplemented method from superclass
virtual void updateInputMethodInfo();
- QCursor setCursor(const QCursor &cursor);
+ void setCursor(const QCursor &cursor);
protected:
void mousePressEvent( QMouseEvent* event );
--- trunk/koffice/kformula/flake/tests/TestCursor.cpp #1158519:1158520
<at> <at> -74,12 +74,7 <at> <at>
return KoUnit(KoUnit::Millimeter);
}
void updateInputMethodInfo() {}
-
-
- QCursor setCursor(const QCursor &cursor)
- {
- return cursor;
- }
+ void setCursor(const QCursor &) {}
};
void TestCursor::moveCursor()
--- trunk/koffice/krita/plugins/extensions/painterlyframework/mixercanvas.cpp #1158519:1158520
<at> <at> -207,10 +207,9 <at> <at>
return KoColor();
}
-QCursor MixerCanvas::setCursor(const QCursor &cursor)
+void MixerCanvas::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QWidget::cursor();
QWidget::setCursor(cursor);
- return oldCursor;
}
+
#include "mixercanvas.moc"
--- trunk/koffice/krita/plugins/extensions/painterlyframework/mixercanvas.h #1158519:1158520
<at> <at> -67,7 +67,7 <at> <at>
KoColor currentColorAt(QPoint pos);
- QCursor setCursor(const QCursor &cursor);
+ void setCursor(const QCursor &cursor);
protected:
// Events to be redirected to the MixerTool
--- trunk/koffice/krita/ui/canvas/kis_canvas2.cpp #1158519:1158520
<at> <at> -601,11 +601,9 <at> <at>
return false;
}
-QCursor KisCanvas2::setCursor(const QCursor &cursor)
+void KisCanvas2::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = canvasWidget()->cursor();
canvasWidget()->setCursor(cursor);
- return oldCursor;
}
#include "kis_canvas2.moc"
--- trunk/koffice/krita/ui/canvas/kis_canvas2.h #1158519:1158520
<at> <at> -195,7 +195,7 <at> <at>
void slotCanvasDestroyed(QWidget* w);
- QCursor setCursor(const QCursor &cursor);
+ void setCursor(const QCursor &cursor);
public:
// friend class KisView2;
--- trunk/koffice/krita/ui/flake/kis_shape_layer_canvas.h #1158519:1158520
<at> <at> -60,7 +60,7 <at> <at>
const QWidget* canvasWidget() const;
KoUnit unit() const;
virtual void updateInputMethodInfo() {}
- QCursor setCursor(const QCursor &cursor) { return cursor; }
+ virtual void setCursor(const QCursor &) {}
private slots:
void repaint();
--- trunk/koffice/krita/ui/flake/kis_shape_selection_canvas.h #1158519:1158520
<at> <at> -52,10 +52,7 <at> <at>
const QWidget* canvasWidget() const;
KoUnit unit() const;
virtual void updateInputMethodInfo() {}
- QCursor setCursor(const QCursor &cursor)
- {
- return cursor;
- }
+ virtual void setCursor(const QCursor &) {}
private:
KoShapeManager * m_shapeManager;
};
--- trunk/koffice/kspread/part/Canvas.cpp #1158519:1158520
<at> <at> -372,10 +372,9 <at> <at>
view()->disableAutoScroll();
}
-QCursor Canvas::setCursor(const QCursor &cursor)
+void Canvas::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QWidget::cursor();
QWidget::setCursor(cursor);
- return oldCursor;
}
+
#include "Canvas.moc"
--- trunk/koffice/kspread/part/Canvas.h #1158519:1158520
<at> <at> -96,6 +96,8 <at> <at>
virtual Sheet* activeSheet() const;
virtual KSpread::Selection* selection() const;
+ virtual void setCursor(const QCursor &cursor);
+
public Q_SLOTS:
void setDocumentOffset(const QPoint& offset) {
CanvasBase::setDocumentOffset(offset);
<at> <at> -103,9 +105,7 <at> <at>
void setDocumentSize(const QSizeF& size) {
CanvasBase::setDocumentSize(size);
}
- QCursor setCursor(const QCursor &cursor);
-
Q_SIGNALS:
/* virtual */ void documentSizeChanged(const QSize&);
--- trunk/koffice/kspread/part/CanvasItem.cpp #1158519:1158520
<at> <at> -395,11 +395,9 <at> <at>
return d->rowHeader;
}
-QCursor CanvasItem::setCursor(const QCursor &cursor)
+void CanvasItem::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QGraphicsWidget::cursor();
QGraphicsWidget::setCursor(cursor);
- return oldCursor;
}
#include "CanvasItem.moc"
--- trunk/koffice/kspread/part/CanvasItem.h #1158519:1158520
<at> <at> -174,7 +174,7 <at> <at>
virtual ColumnHeader* columnHeader() const;
virtual RowHeader* rowHeader() const;
- virtual QCursor setCursor(const QCursor &cursor);
+ virtual void setCursor(const QCursor &cursor);
private:
Q_DISABLE_COPY(CanvasItem)
--- trunk/koffice/kword/part/KWCanvas.cpp #1158519:1158520
<at> <at> -165,11 +165,9 <at> <at>
painter.end();
}
-QCursor KWCanvas::setCursor(const QCursor &cursor)
+void KWCanvas::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QWidget::cursor();
QWidget::setCursor(cursor);
- return oldCursor;
}
void KWCanvas::updateInputMethodInfo()
--- trunk/koffice/kword/part/KWCanvas.h #1158519:1158520
<at> <at> -81,7 +81,7 <at> <at>
return m_view;
}
- virtual QCursor setCursor(const QCursor &cursor);
+ virtual void setCursor(const QCursor &cursor);
public slots:
/**
--- trunk/koffice/kword/part/KWCanvasItem.cpp #1158519:1158520
<at> <at> -181,9 +181,7 <at> <at>
KWCanvasBase::paint(*painter, option->exposedRect);
}
-QCursor KWCanvasItem::setCursor(const QCursor &cursor)
+void KWCanvasItem::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QGraphicsWidget::cursor();
QGraphicsWidget::setCursor(cursor);
- return oldCursor;
}
--- trunk/koffice/kword/part/KWCanvasItem.h #1158519:1158520
<at> <at> -86,7 +86,7 <at> <at>
/// reimplemented method from superclass
virtual void updateInputMethodInfo();
- virtual QCursor setCursor(const QCursor &cursor);
+ virtual void setCursor(const QCursor &cursor);
public slots:
/**
--- trunk/koffice/libs/flake/KoCanvasBase.h #1158519:1158520
<at> <at> -94,7 +94,7 <at> <at>
* <at> param cursor the new cursor
* <at> return the old cursor
*/
- virtual QCursor setCursor(const QCursor &cursor) = 0;
+ virtual void setCursor(const QCursor &cursor) = 0;
/**
* Adds a command to the history. Call this for each <at> p command you create.
--- trunk/koffice/libs/flake/KoShapePainter.cpp #1158519:1158520
<at> <at> -100,10 +100,7 <at> <at>
virtual void updateInputMethodInfo() {}
- QCursor setCursor(const QCursor &cursor)
- {
- return cursor;
- }
+ void setCursor(const QCursor &) {}
private:
KoShapeManager *m_shapeManager;
--- trunk/koffice/libs/flake/tests/MockShapes.h #1158519:1158520
<at> <at> -87,10 +87,7 <at> <at>
return KoUnit(KoUnit::Millimeter);
}
void updateInputMethodInfo() {}
- QCursor setCursor(const QCursor &cursor)
- {
- return cursor;
- }
+ void setCursor(const QCursor &) {}
};
class MockShapeController : public KoShapeControllerBase
--- trunk/koffice/libs/kopageapp/KoPACanvas.cpp #1158519:1158520
<at> <at> -318,11 +318,9 <at> <at>
return &d->doc->guidesData();
}
-QCursor KoPACanvas::setCursor(const QCursor &cursor)
+void KoPACanvas::setCursor(const QCursor &cursor)
{
- QCursor oldCursor = QWidget::cursor();
QWidget::setCursor(cursor);
- return oldCursor;
}
#include <KoPACanvas.moc>
--- trunk/koffice/libs/kopageapp/KoPACanvas.h #1158519:1158520
<at> <at> -76,7 +76,7 <at> <at>
QPoint viewToWidget(const QPoint& p) const;
QRect viewToWidget(const QRect& r) const;
- QCursor setCursor(const QCursor &cursor);
+ virtual void setCursor(const QCursor &cursor);
public slots:
/// Recalculates the size of the canvas (needed when zooming or changing pagelayout)
--- trunk/koffice/plugins/dockers/shapeselector/Canvas.h #1158519:1158520
<at> <at> -72,7 +72,9 <at> <at>
virtual void updateInputMethodInfo() {}
/// implementing KoCanvasBase
virtual const QWidget* canvasWidget() const { return 0; }
- QCursor setCursor(const QCursor &cursor) { return cursor; }
+ void setCursor(const QCursor &cursor) {
+ QWidget::setCursor(cursor);
+ }
ItemStore *itemStore() const { return m_parent->itemStore(); }
/**
RSS Feed