Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Tusooa Zhu
Krita
Commits
54162141
Commit
54162141
authored
Apr 02, 2007
by
David Faure
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perl $KDESRC/4/kdesdk/scripts/qt4/adapt-to-kde4-api.pl
svn path=/trunk/koffice/; revision=649645
parent
0fc3b409
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
48 additions
and
48 deletions
+48
-48
libs/kformula/BracketElement.cpp
libs/kformula/BracketElement.cpp
+8
-8
libs/kformula/OperatorElement.cpp
libs/kformula/OperatorElement.cpp
+12
-12
libs/kformula/PaddedElement.cpp
libs/kformula/PaddedElement.cpp
+17
-17
libs/kformula/TokenElement.cpp
libs/kformula/TokenElement.cpp
+1
-1
libs/kformula/UnderOverElement.cpp
libs/kformula/UnderOverElement.cpp
+3
-3
libs/kofficeui/KoContextHelp.cpp
libs/kofficeui/KoContextHelp.cpp
+1
-1
libs/koproperty/editoritem.cpp
libs/koproperty/editoritem.cpp
+2
-2
libs/koproperty/editors/spinbox.cpp
libs/koproperty/editors/spinbox.cpp
+1
-1
libs/koproperty/widget.cpp
libs/koproperty/widget.cpp
+2
-2
libs/kotext/styles/KoParagraphStyle.cpp
libs/kotext/styles/KoParagraphStyle.cpp
+1
-1
No files found.
libs/kformula/BracketElement.cpp
View file @
54162141
...
...
@@ -242,7 +242,7 @@ bool BracketElement::readAttributesFromMathMLDom(const QDomElement& element)
else { // mfenced, see attributes in section 3.3.8.2
leftType = LeftRoundBracket;
rightType = RightRoundBracket;
QString openStr = element.attribute( "open" ).
s
tri
pWhiteSpace
();
QString openStr = element.attribute( "open" ).tri
mmed
();
if ( !openStr.isNull() ) {
m_customLeft = true;
if ( openStr == "[" )
...
...
@@ -268,7 +268,7 @@ bool BracketElement::readAttributesFromMathMLDom(const QDomElement& element)
else // TODO: Check for entity references
leftType = LeftRoundBracket;
}
QString closeStr = element.attribute( "close" ).
s
tri
pWhiteSpace
();
QString closeStr = element.attribute( "close" ).tri
mmed
();
if ( !closeStr.isNull() ) {
m_customRight = true;
if ( closeStr == "[" )
...
...
@@ -294,7 +294,7 @@ bool BracketElement::readAttributesFromMathMLDom(const QDomElement& element)
else // TODO: Check for entity references
rightType = LeftRoundBracket;
}
m_separators = element.attribute( "separators" ).simplif
yWhiteSpace
();
m_separators = element.attribute( "separators" ).simplif
ied
();
}
return true;
}
...
...
@@ -322,7 +322,7 @@ int BracketElement::readContentFromMathMLDom(QDomNode& node)
empty = true;
}
if ( nodeNum > 1 ) { // More than two elements inside, infer a mrow
k
d
Warning() << "NodeNum: " << nodeNum << endl;
kWarning() << "NodeNum: " << nodeNum << endl;
QDomDocument doc = node.ownerDocument();
QDomElement de = doc.createElement( "mrow" );
int i = 0;
...
...
@@ -333,7 +333,7 @@ int BracketElement::readContentFromMathMLDom(QDomNode& node)
} while ( ++i < nodeNum );
parent.insertAfter( de, open );
node = de;
k
d
Warning() << doc.toString() << endl;
kWarning() << doc.toString() << endl;
}
}
else {
...
...
@@ -451,11 +451,11 @@ int BracketElement::searchOperator( const QDomNode& node )
QString form = e.attribute( "form" );
QString f;
if ( ! form.isNull() ) {
f = form.
s
tri
pWhiteSpace
().lower();
f = form.tri
mmed
().lower();
}
QString fence = e.attribute( "fence" );
if ( ! fence.isNull() ) {
if ( fence.
s
tri
pWhiteSpace
().lower() == "false" ) {
if ( fence.tri
mmed
().lower() == "false" ) {
continue;
}
if ( ! f.isNull() ) {
...
...
@@ -472,7 +472,7 @@ int BracketElement::searchOperator( const QDomNode& node )
QDomNode child = e.firstChild();
QString name;
if ( child.isText() )
name = child.toText().data().
s
tri
pWhiteSpace
();
name = child.toText().data().tri
mmed
();
else if ( child.isEntityReference() )
name = child.nodeName();
else
...
...
libs/kformula/OperatorElement.cpp
View file @
54162141
...
...
@@ -55,7 +55,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
return false;
}
QString formStr = element.attribute( "form" ).
s
tri
pWhiteSpace
().lower();
QString formStr = element.attribute( "form" ).tri
mmed
().lower();
if ( ! formStr.isNull() ) {
m_customForm = true;
if ( formStr == "prefix" ) {
...
...
@@ -72,7 +72,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_customForm = false;
}
}
QString fenceStr = element.attribute( "fence" ).
s
tri
pWhiteSpace
().lower();
QString fenceStr = element.attribute( "fence" ).tri
mmed
().lower();
if ( ! fenceStr.isNull() ) {
m_customFence = true;
if ( fenceStr == "true" ) {
...
...
@@ -86,7 +86,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_customFence = false;
}
}
QString separatorStr = element.attribute( "separator" ).
s
tri
pWhiteSpace
().lower();
QString separatorStr = element.attribute( "separator" ).tri
mmed
().lower();
if ( ! separatorStr.isNull() ) {
m_customSeparator = true;
if ( separatorStr == "true" ) {
...
...
@@ -100,7 +100,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_customSeparator = false;
}
}
QString lspaceStr = element.attribute( "lspace" ).
s
tri
pWhiteSpace
().lower();
QString lspaceStr = element.attribute( "lspace" ).tri
mmed
().lower();
if ( ! lspaceStr.isNull() ) {
m_customLSpace = true;
m_lspace = getSize( lspaceStr, &m_lspaceType );
...
...
@@ -108,7 +108,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_lspaceType = getSpace( lspaceStr );
}
}
QString rspaceStr = element.attribute( "rspace" ).
s
tri
pWhiteSpace
().lower();
QString rspaceStr = element.attribute( "rspace" ).tri
mmed
().lower();
if ( ! rspaceStr.isNull() ) {
m_customRSpace = true;
m_rspace = getSize( rspaceStr, &m_rspaceType );
...
...
@@ -116,7 +116,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_rspaceType = getSpace( rspaceStr );
}
}
QString stretchyStr = element.attribute( "stretchy" ).
s
tri
pWhiteSpace
().lower();
QString stretchyStr = element.attribute( "stretchy" ).tri
mmed
().lower();
if ( ! stretchyStr.isNull() ) {
m_customStretchy = true;
if ( stretchyStr == "true" ) {
...
...
@@ -130,7 +130,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_customStretchy = false;
}
}
QString symmetricStr = element.attribute( "symmetric" ).
s
tri
pWhiteSpace
().lower();
QString symmetricStr = element.attribute( "symmetric" ).tri
mmed
().lower();
if ( ! symmetricStr.isNull() ) {
m_customSymmetric = true;
if ( symmetricStr == "true" ) {
...
...
@@ -144,7 +144,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_customSymmetric = false;
}
}
QString maxsizeStr = element.attribute( "maxsize" ).
s
tri
pWhiteSpace
().lower();
QString maxsizeStr = element.attribute( "maxsize" ).tri
mmed
().lower();
if ( ! maxsizeStr.isNull() ) {
m_customMaxSize = true;
if ( maxsizeStr == "infinity" ) {
...
...
@@ -157,7 +157,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
}
}
}
QString minsizeStr = element.attribute( "minsize" ).
s
tri
pWhiteSpace
().lower();
QString minsizeStr = element.attribute( "minsize" ).tri
mmed
().lower();
if ( ! minsizeStr.isNull() ) {
m_customMinSize = true;
m_minSize = getSize( minsizeStr, &m_minSizeType );
...
...
@@ -165,7 +165,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_minSizeType = getSpace( minsizeStr );
}
}
QString largeopStr = element.attribute( "largeop" ).
s
tri
pWhiteSpace
().lower();
QString largeopStr = element.attribute( "largeop" ).tri
mmed
().lower();
if ( ! largeopStr.isNull() ) {
m_customLargeOp = true;
if ( largeopStr == "true" ) {
...
...
@@ -179,7 +179,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_customLargeOp = false;
}
}
QString movablelimitsStr = element.attribute( "movablelimits" ).
s
tri
pWhiteSpace
().lower();
QString movablelimitsStr = element.attribute( "movablelimits" ).tri
mmed
().lower();
if ( ! movablelimitsStr.isNull() ) {
m_customMovableLimits = true;
if ( movablelimitsStr == "true" ) {
...
...
@@ -193,7 +193,7 @@ bool OperatorElement::readAttributesFromMathMLDom( const QDomElement &element )
m_customMovableLimits = false;
}
}
QString accentStr = element.attribute( "accent" ).
s
tri
pWhiteSpace
().lower();
QString accentStr = element.attribute( "accent" ).tri
mmed
().lower();
if ( ! accentStr.isNull() ) {
m_customAccent = true;
if ( accentStr == "true" ) {
...
...
libs/kformula/PaddedElement.cpp
View file @
54162141
...
...
@@ -118,19 +118,19 @@ bool PaddedElement::readAttributesFromMathMLDom(const QDomElement& element)
return false;
}
QString widthStr = element.attribute( "width" ).
s
tri
pWhiteSpace
().lower();
QString widthStr = element.attribute( "width" ).tri
mmed
().lower();
if ( ! widthStr.isNull() ) {
m_width = readSizeAttribute( widthStr, &m_widthType, &m_widthRelative );
}
QString lspaceStr = element.attribute( "lspace" ).
s
tri
pWhiteSpace
().lower();
QString lspaceStr = element.attribute( "lspace" ).tri
mmed
().lower();
if ( ! lspaceStr.isNull() ) {
m_lspace = readSizeAttribute( lspaceStr, &m_lspaceType, &m_lspaceRelative );
}
QString heightStr = element.attribute( "height" ).
s
tri
pWhiteSpace
().lower();
QString heightStr = element.attribute( "height" ).tri
mmed
().lower();
if ( ! heightStr.isNull() ) {
m_height = readSizeAttribute( heightStr, &m_heightType, &m_heightRelative );
}
QString depthStr = element.attribute( "depth" ).
s
tri
pWhiteSpace
().lower();
QString depthStr = element.attribute( "depth" ).tri
mmed
().lower();
if ( ! depthStr.isNull() ) {
m_depth = readSizeAttribute( depthStr, &m_depthType, &m_depthRelative );
}
...
...
@@ -158,53 +158,53 @@ double PaddedElement::readSizeAttribute( const QString& str, SizeType* st, bool*
if
(
index
!=
-
1
)
{
int
index2
=
str
.
find
(
"%"
);
if
(
index2
!=
-
1
)
{
return
str2size
(
str
.
left
(
index2
).
s
tri
pWhiteSpace
(),
st
,
WidthRelativeSize
)
/
100.0
;
return
str2size
(
str
.
left
(
index2
).
tri
mmed
(),
st
,
WidthRelativeSize
)
/
100.0
;
}
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
WidthRelativeSize
);
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
WidthRelativeSize
);
}
index
=
str
.
find
(
"height"
);
if
(
index
!=
-
1
)
{
int
index2
=
str
.
find
(
"%"
);
if
(
index2
!=
-
1
)
{
return
str2size
(
str
.
left
(
index2
).
s
tri
pWhiteSpace
(),
st
,
HeightRelativeSize
)
/
100.0
;
return
str2size
(
str
.
left
(
index2
).
tri
mmed
(),
st
,
HeightRelativeSize
)
/
100.0
;
}
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
HeightRelativeSize
);
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
HeightRelativeSize
);
}
index
=
str
.
find
(
"%"
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
RelativeSize
)
/
100.0
;
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
RelativeSize
)
/
100.0
;
}
index
=
str
.
find
(
"pt"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
AbsoluteSize
);
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
AbsoluteSize
);
}
index
=
str
.
find
(
"mm"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
AbsoluteSize
)
*
72.0
/
20.54
;
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
AbsoluteSize
)
*
72.0
/
20.54
;
}
index
=
str
.
find
(
"cm"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
AbsoluteSize
)
*
72.0
/
2.54
;
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
AbsoluteSize
)
*
72.0
/
2.54
;
}
index
=
str
.
find
(
"in"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
AbsoluteSize
)
*
72.0
;
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
AbsoluteSize
)
*
72.0
;
}
index
=
str
.
find
(
"em"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
RelativeSize
);
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
RelativeSize
);
}
index
=
str
.
find
(
"ex"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
RelativeSize
);
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
RelativeSize
);
}
index
=
str
.
find
(
"pc"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
AbsoluteSize
)
*
12.0
;
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
AbsoluteSize
)
*
12.0
;
}
index
=
str
.
find
(
"px"
,
0
,
false
);
if
(
index
!=
-
1
)
{
return
str2size
(
str
.
left
(
index
).
s
tri
pWhiteSpace
(),
st
,
PixelSize
);
return
str2size
(
str
.
left
(
index
).
tri
mmed
(),
st
,
PixelSize
);
}
// If there's no unit, assume 'pt'
return
str2size
(
str
,
st
,
AbsoluteSize
);
...
...
libs/kformula/TokenElement.cpp
View file @
54162141
...
...
@@ -44,7 +44,7 @@ int TokenElement::buildChildrenFromMathMLDom(QList<BasicElement*>& list, QDomNod
while
(
!
n
.
isNull
()
)
{
if
(
n
.
isText
()
)
{
QString
textelements
=
n
.
toText
().
data
();
textelements
=
textelements
.
s
tri
pWhiteSpace
();
textelements
=
textelements
.
tri
mmed
();
for
(
uint
i
=
0
;
i
<
textelements
.
length
();
i
++
)
{
TextElement
*
child
=
new
TextElement
(
textelements
[
i
]);
...
...
libs/kformula/UnderOverElement.cpp
View file @
54162141
...
...
@@ -54,10 +54,10 @@ bool UnderOverElement::readAttributesFromMathMLDom( const QDomElement& element )
return false;
}
QString tag = element.tagName().
s
tri
pWhiteSpace
().lower();
QString tag = element.tagName().tri
mmed
().lower();
if ( tag == "munder" || tag == "munderover" ) {
QString accentunderStr = element.attribute( "accentunder" ).
s
tri
pWhiteSpace
().lower();
QString accentunderStr = element.attribute( "accentunder" ).tri
mmed
().lower();
if ( ! accentunderStr.isNull() ) {
if ( accentunderStr == "true" ) {
m_customAccentUnder = true;
...
...
@@ -74,7 +74,7 @@ bool UnderOverElement::readAttributesFromMathMLDom( const QDomElement& element )
}
}
if ( tag == "mover" || tag == "munderover" ) {
QString accentStr = element.attribute( "accent" ).
s
tri
pWhiteSpace
().lower();
QString accentStr = element.attribute( "accent" ).tri
mmed
().lower();
if ( ! accentStr.isNull() ) {
if ( accentStr == "true" ) {
m_customAccent = true;
...
...
libs/kofficeui/KoContextHelp.cpp
View file @
54162141
...
...
@@ -256,7 +256,7 @@ void KoHelpView::mouseMoveEvent( QMouseEvent* e )
if
(
!
currentText
->
anchorAt
(
e
->
pos
()
).
isEmpty
()
)
setCursor
(
Qt
::
PointingHandCursor
);
else
setCursor
(
KCursor
::
a
rrowCursor
()
);
setCursor
(
Qt
::
A
rrowCursor
);
}
// KoHelpView::mouseMove
bool
KoHelpView
::
eventFilter
(
QObject
*
,
QEvent
*
e
)
...
...
libs/koproperty/editoritem.cpp
View file @
54162141
...
...
@@ -151,7 +151,7 @@ class GroupWidgetBase : public QWidget
f
.
setBold
(
true
);
p
.
setFont
(
f
);
p
.
drawText
(
indent
+
8
,
0
,
width
()
-
(
indent
+
8
),
height
(),
Qt
::
AlignLeft
|
Qt
::
AlignVCenter
|
Qt
::
SingleLine
,
height
(),
Qt
::
AlignLeft
|
Qt
::
AlignVCenter
|
Qt
::
Text
SingleLine
,
m_titleStr
);
}
// p.setPen(palette().active().mid());
...
...
@@ -580,7 +580,7 @@ EditorGroupItem::paintCell(QPainter *p, const QColorGroup & cg, int column, int
K3ListViewItem::paintCell(p, cg, column, width, align);
p->setPen(cg.text());
p->drawText(QRect(0,0, totalWidth, height()),
Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, text(0));*/
Qt::AlignLeft | Qt::AlignVCenter | Qt::
Text
SingleLine, text(0));*/
}
void
...
...
libs/koproperty/editors/spinbox.cpp
View file @
54162141
...
...
@@ -218,7 +218,7 @@ DoubleSpinBox::eventFilter(QObject *o, QEvent *e)
if
(
e
->
type
()
==
QEvent
::
KeyPress
)
{
QKeyEvent
*
ev
=
static_cast
<
QKeyEvent
*>
(
e
);
if
((
ev
->
key
()
==
Qt
::
Key_Up
||
ev
->
key
()
==
Qt
::
Key_Down
)
&&
ev
->
modifiers
()
!=
Qt
::
Control
Button
)
if
((
ev
->
key
()
==
Qt
::
Key_Up
||
ev
->
key
()
==
Qt
::
Key_Down
)
&&
ev
->
modifiers
()
!=
Qt
::
Control
Modifier
)
{
parentWidget
()
->
eventFilter
(
o
,
e
);
return
true
;
...
...
libs/koproperty/widget.cpp
View file @
54162141
...
...
@@ -129,13 +129,13 @@ Widget::eventFilter(QObject*, QEvent* e)
/* moved in Editor
if (item) {
if(ev->key() == Qt::Key_Up && ev->state() != Qt::Control
Button
)
if(ev->key() == Qt::Key_Up && ev->state() != Qt::Control
Modifier
)
{
if(item->itemAbove())
list->setCurrentItem(item->itemAbove());
return true;
}
else if(ev->key() == Qt::Key_Down && ev->state() != Qt::Control
Button
)
else if(ev->key() == Qt::Key_Down && ev->state() != Qt::Control
Modifier
)
{
if(item->itemBelow())
list->setCurrentItem(item->itemBelow());
...
...
libs/kotext/styles/KoParagraphStyle.cpp
View file @
54162141
...
...
@@ -795,7 +795,7 @@ void KoParagraphStyle::loadOasis(KoStyleStack& styleStack) {
KoTabulatorList tabList;
if ( styleStack.hasChildNodeNS( KoXmlNS::style, "tab-stops" ) ) { // 3.11.10
QDomElement tabStops = styleStack.childNodeNS( KoXmlNS::style, "tab-stops" );
//k
d
Debug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl;
//kDebug(30519) << k_funcinfo << tabStops.childNodes().count() << " tab stops in layout." << endl;
QDomElement tabStop;
forEachElement( tabStop, tabStops )
{
...
...
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