[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice
From: Thomas Zander <zander () kde ! org>
Date: 2007-05-21 15:18:33
Message-ID: 1179760713.982452.16957.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 667018 by zander:
Remove unused include KoCanvasResourceProvider.h from KoTool.h and add the include
in all the inheriting classes that need it.
Also make the various Karbon tools follow the refactor from passing an enum to now
passing an int to virtual slot:
KoTool::resourceChanged( int key, const QVariant & res );
M +2 -1 karbon/plugins/tools/KarbonGradientTool.cpp
M +1 -1 karbon/plugins/tools/KarbonGradientTool.h
M +2 -1 karbon/plugins/tools/KarbonPatternTool.cpp
M +1 -1 karbon/plugins/tools/KarbonPatternTool.h
M +0 -4 karbon/plugins/tools/KarbonPencilTool.cpp
M +0 -1 karbon/plugins/tools/KarbonPencilTool.h
M +1 -0 kspread/View.cpp
M +1 -0 libs/flake/KoCreatePathTool.cpp
M +1 -0 libs/flake/KoCreatePathTool.h
M +1 -0 libs/flake/KoInteractionTool.cpp
M +1 -0 libs/flake/KoPathTool.cpp
M +2 -1 libs/flake/KoShapeMoveStrategy.cpp
M +1 -0 libs/flake/KoShapeResizeStrategy.cpp
M +1 -0 libs/flake/KoShapeRotateStrategy.cpp
M +1 -0 libs/flake/KoShapeShearStrategy.cpp
M +1 -0 libs/flake/KoTool.cpp
M +0 -2 libs/flake/KoTool.h
--- trunk/koffice/karbon/plugins/tools/KarbonGradientTool.cpp #667017:667018
@@ -27,6 +27,7 @@
#include <KoShape.h>
#include <KoCanvasBase.h>
+#include <KoCanvasResourceProvider.h>
#include <KoShapeManager.h>
#include <KoSelection.h>
#include <KoPointerEvent.h>
@@ -207,7 +208,7 @@
qDeleteAll( m_gradients );
}
-void KarbonGradientTool::resourceChanged( KoCanvasResource::EnumCanvasResource key, \
const QVariant & res ) +void KarbonGradientTool::resourceChanged( int key, const \
QVariant & res ) {
switch( key )
{
--- trunk/koffice/karbon/plugins/tools/KarbonGradientTool.h #667017:667018
@@ -53,7 +53,7 @@
virtual QWidget * createOptionWidget();
private Q_SLOTS:
- virtual void resourceChanged( KoCanvasResource::EnumCanvasResource key, const \
QVariant & res ); + virtual void resourceChanged( int key, const QVariant & res );
void initialize();
void gradientChanged();
private:
--- trunk/koffice/karbon/plugins/tools/KarbonPatternTool.cpp #667017:667018
@@ -29,6 +29,7 @@
#include <KoShapeManager.h>
#include <KoSelection.h>
#include <KoShape.h>
+#include <KoCanvasResourceProvider.h>
#include <KoShapeBackgroundCommand.h>
#include <KoPointerEvent.h>
@@ -199,7 +200,7 @@
shape->repaint();
}
-void KarbonPatternTool::resourceChanged( KoCanvasResource::EnumCanvasResource key, \
const QVariant & res ) +void KarbonPatternTool::resourceChanged( int key, const \
QVariant & res ) {
switch( key )
{
--- trunk/koffice/karbon/plugins/tools/KarbonPatternTool.h #667017:667018
@@ -52,7 +52,7 @@
virtual QWidget * createOptionWidget();
private slots:
- virtual void resourceChanged( KoCanvasResource::EnumCanvasResource key, const \
QVariant & res ); + virtual void resourceChanged( int key, const QVariant & res );
void slotButtonClicked( int button );
void patternSelected( QTableWidgetItem * item );
void importPattern();
--- trunk/koffice/karbon/plugins/tools/KarbonPencilTool.cpp #667017:667018
@@ -133,10 +133,6 @@
m_shape = 0;
}
-void KarbonPencilTool::resourceChanged( KoCanvasResource::EnumCanvasResource key, \
const QVariant & res )
-{
-}
-
void KarbonPencilTool::addPoint( const QPointF & point )
{
if( ! m_shape )
--- trunk/koffice/karbon/plugins/tools/KarbonPencilTool.h #667017:667018
@@ -46,7 +46,6 @@
virtual QWidget * createOptionWidget();
private slots:
- virtual void resourceChanged( KoCanvasResource::EnumCanvasResource key, const \
QVariant & res ); void selectMode( int mode );
void setOptimize( int state );
void setDelta( double delta );
--- trunk/koffice/kspread/View.cpp #667017:667018
@@ -92,6 +92,7 @@
// KOffice includes
#include <kdatatool.h>
#include <KoCanvasController.h>
+#include <KoCanvasResourceProvider.h>
#include <KoCharSelectDia.h>
#include <KoColor.h>
#include <KoMainWindow.h>
--- trunk/koffice/libs/flake/KoCreatePathTool.cpp #667017:667018
@@ -27,6 +27,7 @@
#include "KoShapeManager.h"
#include "KoSelection.h"
#include "KoShapeController.h"
+#include "KoCanvasResourceProvider.h"
#include <QPainter>
--- trunk/koffice/libs/flake/KoCreatePathTool.h #667017:667018
@@ -25,6 +25,7 @@
class KoPathShape;
class KoPathPoint;
+class QRectF;
#define KoCreatePathTool_ID "CreatePathTool"
--- trunk/koffice/libs/flake/KoInteractionTool.cpp #667017:667018
@@ -35,6 +35,7 @@
#include "KoInteractionStrategy.h"
#include "KoCanvasBase.h"
#include "KoPanTool.h"
+#include "KoCanvasResourceProvider.h"
#include "commands/KoShapeMoveCommand.h"
#include <QUndoCommand>
--- trunk/koffice/libs/flake/KoPathTool.cpp #667017:667018
@@ -22,6 +22,7 @@
#include "KoCanvasBase.h"
#include "KoSelection.h"
#include "KoShapeManager.h"
+#include "KoCanvasResourceProvider.h"
#include "KoPointerEvent.h"
#include "commands/KoPathPointTypeCommand.h"
#include "commands/KoPathPointInsertCommand.h"
--- trunk/koffice/libs/flake/KoShapeMoveStrategy.cpp #667017:667018
@@ -27,8 +27,9 @@
#include "KoShapeContainerModel.h"
#include "KoSelection.h"
#include "KoPointerEvent.h"
+#include "KoCanvasResourceProvider.h"
+#include "KoInteractionTool.h"
#include "commands/KoShapeMoveCommand.h"
-#include "KoInteractionTool.h"
#include <kdebug.h>
#include <QPainter>
--- trunk/koffice/libs/flake/KoShapeResizeStrategy.cpp #667017:667018
@@ -21,6 +21,7 @@
#include "KoShapeManager.h"
#include "KoPointerEvent.h"
#include "KoCanvasBase.h"
+#include "KoCanvasResourceProvider.h"
#include "commands/KoShapeMoveCommand.h"
#include "commands/KoShapeSizeCommand.h"
--- trunk/koffice/libs/flake/KoShapeRotateStrategy.cpp #667017:667018
@@ -22,6 +22,7 @@
#include "KoCanvasBase.h"
#include "KoPointerEvent.h"
#include "KoShapeManager.h"
+#include "KoCanvasResourceProvider.h"
#include "commands/KoShapeMoveCommand.h"
#include "commands/KoShapeRotateCommand.h"
--- trunk/koffice/libs/flake/KoShapeShearStrategy.cpp #667017:667018
@@ -23,6 +23,7 @@
#include "KoCanvasBase.h"
#include "KoPointerEvent.h"
#include "KoShapeManager.h"
+#include "KoCanvasResourceProvider.h"
#include "commands/KoShapeShearCommand.h"
#include "commands/KoShapeMoveCommand.h"
--- trunk/koffice/libs/flake/KoTool.cpp #667017:667018
@@ -20,6 +20,7 @@
#include "KoTool.h"
#include "KoCanvasBase.h"
#include "KoPointerEvent.h"
+#include "KoCanvasResourceProvider.h"
#include <kactioncollection.h>
#include <QWidget>
--- trunk/koffice/libs/flake/KoTool.h #667017:667018
@@ -25,8 +25,6 @@
#include <flake_export.h>
-#include <KoCanvasResourceProvider.h>
-
class KoCanvasBase;
class KoPointerEvent;
class KoViewConverter;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic