Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Krita
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tusooa Zhu
Krita
Commits
04278689
Commit
04278689
authored
Dec 17, 2008
by
Jan Hambrecht
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SVN_SILENT krazy fixes
svn path=/trunk/koffice/; revision=898329
parent
e65d7065
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
19 deletions
+18
-19
libs/flake/KoDeviceRegistry.cpp
libs/flake/KoDeviceRegistry.cpp
+2
-2
libs/flake/KoShape.cpp
libs/flake/KoShape.cpp
+5
-5
libs/flake/KoShapeFactory.cpp
libs/flake/KoShapeFactory.cpp
+2
-3
libs/flake/KoShapeRegistry.cpp
libs/flake/KoShapeRegistry.cpp
+1
-1
libs/flake/KoSnapGuide.cpp
libs/flake/KoSnapGuide.cpp
+3
-3
libs/flake/KoSnapStrategy.cpp
libs/flake/KoSnapStrategy.cpp
+2
-2
libs/flake/KoToolManager.cpp
libs/flake/KoToolManager.cpp
+2
-2
libs/flake/commands/KoPathPointMoveCommand.cpp
libs/flake/commands/KoPathPointMoveCommand.cpp
+1
-1
No files found.
libs/flake/KoDeviceRegistry.cpp
View file @
04278689
...
...
@@ -35,7 +35,7 @@ void KoDeviceRegistry::init()
KoPluginLoader
::
instance
()
->
load
(
QString
::
fromLatin1
(
"KOffice/Device"
),
QString
::
fromLatin1
(
"[X-Flake-MinVersion] <= 0"
));
foreach
(
QString
id
,
keys
())
{
foreach
(
const
QString
&
id
,
keys
())
{
KoDevice
*
d
=
value
(
id
);
if
(
d
)
d
->
start
();
...
...
@@ -44,7 +44,7 @@ void KoDeviceRegistry::init()
KoDeviceRegistry
::~
KoDeviceRegistry
()
{
foreach
(
QString
id
,
keys
())
{
foreach
(
const
QString
&
id
,
keys
())
{
KoDevice
*
d
=
value
(
id
);
if
(
d
)
d
->
stop
();
...
...
libs/flake/KoShape.cpp
View file @
04278689
...
...
@@ -437,8 +437,8 @@ void KoShape::copySettings(const KoShape *shape)
{
d
->
size
=
shape
->
size
();
d
->
connectors
.
clear
();
foreach
(
QPointF
point
,
shape
->
connectionPoints
())
addConnectionPoint
(
point
);
foreach
(
const
QPointF
&
point
,
shape
->
connectionPoints
())
addConnectionPoint
(
point
);
d
->
zIndex
=
shape
->
zIndex
();
d
->
visible
=
shape
->
isVisible
();
...
...
@@ -542,8 +542,8 @@ QList<QPointF> KoShape::connectionPoints() const
QList
<
QPointF
>
points
;
QSizeF
s
=
size
();
// convert glue points to shape coordinates
foreach
(
QPointF
cp
,
d
->
connectors
)
points
.
append
(
QPointF
(
s
.
width
()
*
cp
.
x
(),
s
.
height
()
*
cp
.
y
()));
foreach
(
const
QPointF
&
cp
,
d
->
connectors
)
points
.
append
(
QPointF
(
s
.
width
()
*
cp
.
x
(),
s
.
height
()
*
cp
.
y
()));
return
points
;
}
...
...
@@ -874,7 +874,7 @@ bool KoShape::loadOdfAttributes(const KoXmlElement & element, KoShapeLoadingCont
if
(
attributes
&
OdfAdditionalAttributes
)
{
QSet
<
KoShapeLoadingContext
::
AdditionalAttributeData
>
additionalAttributeData
=
KoShapeLoadingContext
::
additionalAttributeData
();
foreach
(
KoShapeLoadingContext
::
AdditionalAttributeData
attributeData
,
additionalAttributeData
)
{
foreach
(
const
KoShapeLoadingContext
::
AdditionalAttributeData
&
attributeData
,
additionalAttributeData
)
{
if
(
element
.
hasAttributeNS
(
attributeData
.
ns
,
attributeData
.
tag
))
{
QString
value
=
element
.
attributeNS
(
attributeData
.
ns
,
attributeData
.
tag
);
//kDebug(30006) << "load additional attribute" << attributeData.tag << value;
...
...
libs/flake/KoShapeFactory.cpp
View file @
04278689
...
...
@@ -36,8 +36,8 @@ public:
}
~
Private
()
{
foreach
(
KoShapeTemplate
t
,
templates
)
delete
t
.
properties
;
foreach
(
const
KoShapeTemplate
&
t
,
templates
)
delete
t
.
properties
;
templates
.
clear
();
}
...
...
@@ -51,7 +51,6 @@ public:
quint32
loadingPriority
;
QString
odfNameSpace
;
QStringList
odfElementNames
;
};
...
...
libs/flake/KoShapeRegistry.cpp
View file @
04278689
...
...
@@ -107,7 +107,7 @@ void KoShapeRegistry::insertFactory(KoShapeFactory * factory)
if
(
factory
->
odfNameSpace
().
isEmpty
()
||
factory
->
odfElementNames
().
isEmpty
())
{
kDebug
(
30006
)
<<
"Shape factory"
<<
factory
->
id
()
<<
" does not have OdfNamespace defined, ignoring"
;
}
else
{
foreach
(
QString
elementName
,
factory
->
odfElementNames
())
{
foreach
(
const
QString
&
elementName
,
factory
->
odfElementNames
())
{
QPair
<
QString
,
QString
>
p
(
factory
->
odfNameSpace
(),
elementName
);
...
...
libs/flake/KoSnapGuide.cpp
View file @
04278689
...
...
@@ -202,7 +202,7 @@ QList<QPointF> KoSnapProxy::pointsInRect(const QRectF &rect)
QList
<
QPointF
>
points
;
QList
<
KoShape
*>
shapes
=
shapesInRect
(
rect
);
foreach
(
KoShape
*
shape
,
shapes
)
{
foreach
(
QPointF
point
,
pointsFromShape
(
shape
))
{
foreach
(
const
QPointF
&
point
,
pointsFromShape
(
shape
))
{
if
(
rect
.
contains
(
point
))
points
.
append
(
point
);
}
...
...
@@ -284,7 +284,7 @@ QList<KoPathSegment> KoSnapProxy::segmentsInRect(const QRectF &rect)
if
(
path
)
{
shapeSegments
=
path
->
segmentsAt
(
rectOnShape
);
}
else
{
foreach
(
KoPathSegment
s
,
shape
->
snapData
().
snapSegments
())
{
foreach
(
const
KoPathSegment
&
s
,
shape
->
snapData
().
snapSegments
())
{
QRectF
controlRect
=
s
.
controlPointRect
();
if
(
!
rect
.
intersects
(
controlRect
)
&&
!
controlRect
.
contains
(
rect
))
continue
;
...
...
@@ -297,7 +297,7 @@ QList<KoPathSegment> KoSnapProxy::segmentsInRect(const QRectF &rect)
QMatrix
m
=
shape
->
absoluteTransformation
(
0
);
// transform segments to document coordinates
foreach
(
KoPathSegment
s
,
shapeSegments
)
{
foreach
(
const
KoPathSegment
&
s
,
shapeSegments
)
{
if
(
ignoredPoints
.
contains
(
s
.
first
())
||
ignoredPoints
.
contains
(
s
.
second
()))
continue
;
segments
.
append
(
s
.
mapped
(
m
));
...
...
libs/flake/KoSnapStrategy.cpp
View file @
04278689
...
...
@@ -77,7 +77,7 @@ bool OrthogonalSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * pr
QList
<
KoShape
*>
shapes
=
proxy
->
shapes
();
foreach
(
KoShape
*
shape
,
shapes
)
{
QList
<
QPointF
>
points
=
proxy
->
pointsFromShape
(
shape
);
foreach
(
QPointF
point
,
points
)
{
foreach
(
const
QPointF
&
point
,
points
)
{
qreal
dx
=
fabs
(
point
.
x
()
-
mousePosition
.
x
());
if
(
dx
<
minHorzDist
&&
dx
<
maxSnapDistance
)
{
minHorzDist
=
dx
;
...
...
@@ -145,7 +145,7 @@ bool NodeSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * proxy, q
QPointF
snappedPoint
=
mousePosition
;
foreach
(
QPointF
point
,
points
)
{
foreach
(
const
QPointF
&
point
,
points
)
{
qreal
distance
=
fastDistance
(
mousePosition
,
point
);
if
(
distance
<
maxDistance
&&
distance
<
minDistance
)
{
snappedPoint
=
point
;
...
...
libs/flake/KoToolManager.cpp
View file @
04278689
...
...
@@ -181,7 +181,7 @@ void KoToolManager::setup()
KoShapeRegistry
::
instance
();
KoToolRegistry
*
registry
=
KoToolRegistry
::
instance
();
foreach
(
QString
id
,
registry
->
keys
())
{
foreach
(
const
QString
&
id
,
registry
->
keys
())
{
ToolHelper
*
t
=
new
ToolHelper
(
registry
->
value
(
id
));
d
->
tools
.
append
(
t
);
}
...
...
@@ -244,7 +244,7 @@ void KoToolManager::registerTools(KActionCollection *ac, KoCanvasController *con
CanvasData
*
cd
=
d
->
canvasses
.
value
(
controller
).
first
();
foreach
(
KoTool
*
tool
,
cd
->
allTools
)
{
QHash
<
QString
,
KAction
*>
actions
=
tool
->
actions
();
foreach
(
QString
name
,
actions
.
keys
())
foreach
(
const
QString
&
name
,
actions
.
keys
())
ac
->
addAction
(
name
,
actions
[
name
]);
}
}
...
...
libs/flake/commands/KoPathPointMoveCommand.cpp
View file @
04278689
...
...
@@ -69,7 +69,7 @@ void KoPathPointMoveCommand::applyOffset( const QPointF &offset )
// repaint old bounding rect
path
->
update
();
foreach
(
const
KoPathPointIndex
index
,
it
.
value
())
{
foreach
(
const
KoPathPointIndex
&
index
,
it
.
value
())
{
KoPathPoint
*
p
=
path
->
pointByIndex
(
index
);
if
(
p
)
p
->
map
(
matrix
,
true
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment