Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
6a67f00e
Commit
6a67f00e
authored
Feb 09, 2010
by
Christiaan Janssen
Browse files
QmlDesigner: Fixed minor issues
parent
6da581aa
Changes
14
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/components/logger/logger.cpp
View file @
6a67f00e
...
...
@@ -71,9 +71,9 @@ void QLogger::setSilent(bool silent)
instance
()
->
m_silent
=
silent
;
}
void
QLogger
::
setModul
(
const
QString
&
modul
)
void
QLogger
::
setModul
(
const
QString
&
modul
e
)
{
instance
()
->
m_modul
=
modul
;
instance
()
->
m_modul
=
modul
e
;
}
void
QLogger
::
setFilename
(
const
QString
&
filename
)
...
...
src/plugins/qmldesigner/components/logger/logger.h
View file @
6a67f00e
...
...
@@ -49,7 +49,7 @@ public:
setEnabled
(
false
);
}
static
void
setLevel
(
int
level
);
static
void
setModul
(
const
QString
&
modul
);
static
void
setModul
(
const
QString
&
modul
e
);
static
void
setFilename
(
const
QString
&
filename
);
static
void
setEnabled
(
bool
enabled
);
static
void
setFlush
(
int
msec
);
...
...
src/plugins/qmldesigner/components/stateseditor/stateslist.qml
View file @
6a67f00e
...
...
@@ -76,7 +76,6 @@ Rectangle {
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.bottom
:
parent
.
bottom
anchors.bottomMargin
:
12
y
:
18
}
}
...
...
src/plugins/qmldesigner/core/filemanager/addobjectvisitor.cpp
View file @
6a67f00e
...
...
@@ -72,7 +72,7 @@ bool AddObjectVisitor::visit(QmlJS::AST::UiObjectDefinition *ast)
void
AddObjectVisitor
::
insertInto
(
QmlJS
::
AST
::
UiObjectInitializer
*
ast
)
{
UiObjectMemberList
*
insertAfter
=
searchMemberToInsertAfter
(
ast
->
members
,
QString
::
null
,
m_propertyOrder
);
UiObjectMemberList
*
insertAfter
=
searchMemberToInsertAfter
(
ast
->
members
,
QString
()
,
m_propertyOrder
);
int
insertionPoint
;
int
indentDepth
;
...
...
src/plugins/qmldesigner/core/filemanager/moveobjectvisitor.cpp
View file @
6a67f00e
...
...
@@ -87,7 +87,7 @@ private:
{
if
(
targetPropertyName
.
isEmpty
())
{
// insert as UiObjectDefinition:
UiObjectMemberList
*
insertAfter
=
searchMemberToInsertAfter
(
ast
->
members
,
QString
::
null
,
propertyOrder
);
UiObjectMemberList
*
insertAfter
=
searchMemberToInsertAfter
(
ast
->
members
,
QString
()
,
propertyOrder
);
if
(
insertAfter
&&
insertAfter
->
member
)
{
moveInfo
.
destination
=
insertAfter
->
member
->
lastSourceLocation
().
end
();
...
...
src/plugins/qmldesigner/core/filemanager/qmlrewriter.cpp
View file @
6a67f00e
...
...
@@ -294,7 +294,7 @@ UiObjectMemberList *QMLRewriter::searchMemberToInsertAfter(UiObjectMemberList *m
int
idx
=
propertyOrder
.
indexOf
(
propertyName
);
if
(
idx
==
-
1
)
idx
=
propertyOrder
.
indexOf
(
QString
::
null
);
idx
=
propertyOrder
.
indexOf
(
QString
()
);
if
(
idx
==
-
1
)
idx
=
propertyOrder
.
size
()
-
1
;
...
...
src/plugins/qmldesigner/core/include/rewriterview.h
View file @
6a67f00e
...
...
@@ -145,7 +145,7 @@ public:
void
enterErrorState
(
const
QString
&
errorMessage
);
bool
inErrorState
()
const
{
return
!
m_rewritingErrorMessage
.
isEmpty
();
}
void
leaveErrorState
()
{
m_rewritingErrorMessage
=
QString
::
null
;
}
void
leaveErrorState
()
{
m_rewritingErrorMessage
.
clear
()
;
}
void
resetToLastCorrectQml
();
QMap
<
ModelNode
,
QString
>
extractText
(
const
QList
<
ModelNode
>
&
nodes
)
const
;
...
...
src/plugins/qmldesigner/core/metainfo/itemlibraryinfo.cpp
View file @
6a67f00e
...
...
@@ -92,7 +92,7 @@ QList<ItemLibraryInfo::Property> ItemLibraryInfo::properties() const
ItemLibraryInfo
::
ItemLibraryInfo
()
:
m_data
(
new
Internal
::
ItemLibraryInfoData
)
{
m_data
->
name
=
QString
();
m_data
->
name
.
clear
();
}
ItemLibraryInfo
::~
ItemLibraryInfo
()
...
...
src/plugins/qmldesigner/core/model/internalproperty.cpp
View file @
6a67f00e
...
...
@@ -166,7 +166,7 @@ void InternalProperty::setDynamicTypeName(const QString &name)
void
InternalProperty
::
resetDynamicTypeName
()
{
m_dynamicType
=
QString
();
m_dynamicType
.
clear
();
}
...
...
src/plugins/qmldesigner/core/model/qmlanchors.cpp
View file @
6a67f00e
...
...
@@ -53,7 +53,7 @@ static QString lineTypeToString(AnchorLine::Type lineType)
case
AnchorLine
::
Baseline
:
return
QLatin1String
(
"baseline"
);
case
AnchorLine
::
Fill
:
return
QLatin1String
(
"fill"
);
case
AnchorLine
::
Center
:
return
QLatin1String
(
"centerIn"
);
default:
return
QString
::
null
;
default:
return
QString
()
;
}
}
...
...
@@ -101,7 +101,7 @@ static QString marginPropertyName(AnchorLine::Type lineType)
case
AnchorLine
::
Bottom
:
return
QLatin1String
(
"anchors.bottomMargin"
);
case
AnchorLine
::
HorizontalCenter
:
return
QLatin1String
(
"anchors.horizontalCenterOffset"
);
case
AnchorLine
::
VerticalCenter
:
return
QLatin1String
(
"anchors.verticalCenterOffset"
);
default:
return
QString
::
null
;
default:
return
QString
()
;
}
}
...
...
src/plugins/qmldesigner/core/model/qmltextgenerator.cpp
View file @
6a67f00e
...
...
@@ -101,7 +101,7 @@ QString QmlTextGenerator::toQml(const AbstractProperty &property, int indentDept
}
}
else
{
Q_ASSERT
(
"Unknown property type"
);
return
QString
::
null
;
return
QString
()
;
}
}
...
...
src/plugins/qmldesigner/core/model/rewriterview.cpp
View file @
6a67f00e
...
...
@@ -449,7 +449,7 @@ QMap<ModelNode, QString> RewriterView::extractText(const QList<ModelNode> &nodes
const
int
nodeLocation
=
m_positionStorage
->
nodeOffset
(
node
);
if
(
nodeLocation
==
ModelNodePositionStorage
::
INVALID_LOCATION
)
result
.
insert
(
node
,
QString
::
null
);
result
.
insert
(
node
,
QString
()
);
else
result
.
insert
(
node
,
extract
(
nodeLocation
));
}
...
...
src/plugins/qmldesigner/designmodewidget.cpp
View file @
6a67f00e
...
...
@@ -529,7 +529,7 @@ void DesignModeWidget::showEditor(Core::IEditor *editor)
m_currentTextEdit
=
textEdit
;
DocumentWidget
*
documentWidget
=
0
;
if
(
textEdit
&&
textEditor
&&
fileName
.
endsWith
(
".qml"
))
{
if
(
textEdit
&&
textEditor
&&
fileName
.
endsWith
(
QLatin1String
(
".qml"
))
)
{
if
(
m_documentHash
.
contains
(
textEdit
))
{
documentWidget
=
m_documentHash
.
value
(
textEdit
);
}
else
{
...
...
src/tools/qmldesigner/standalone/mainwindow.cpp
View file @
6a67f00e
...
...
@@ -62,7 +62,7 @@ class StyleAction: public QAction
{
public:
StyleAction
(
const
QString
&
text
,
const
QString
&
styleName
,
QObject
*
parent
)
:
QAction
(
text
,
parent
),
m_styleName
(
styleName
)
{}
StyleAction
(
const
QString
&
text
,
QObject
*
parent
)
:
QAction
(
text
,
parent
),
m_styleName
(
QString
::
null
)
{}
StyleAction
(
const
QString
&
text
,
QObject
*
parent
)
:
QAction
(
text
,
parent
),
m_styleName
(
QString
()
)
{}
QString
styleName
()
const
{
return
m_styleName
;
}
...
...
@@ -73,7 +73,7 @@ private:
MainWindow
::
MainWindow
(
QWidget
*
parent
)
:
QMainWindow
(
parent
),
m_shutdown
(
false
),
m_lastPath
(
QString
::
null
),
m_lastPath
(
QString
()
),
m_documentCount
(
0
),
m_menuBar
(
new
QMenuBar
(
this
)),
m_itemLibraryController
(
new
ItemLibraryController
(
this
)),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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