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
Tobias Hunger
qt-creator
Commits
4af3d9bd
Commit
4af3d9bd
authored
Feb 16, 2011
by
Thorbjørn Lindeijer
Browse files
Code cosmetics
parent
7f90d08c
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/libs/utils/crumblepath.cpp
View file @
4af3d9bd
...
...
@@ -214,7 +214,8 @@ QVariant CrumblePathButton::data() const
///////////////////////////////////////////////////////////////////////////////
struct
CrumblePathPrivate
{
struct
CrumblePathPrivate
{
explicit
CrumblePathPrivate
(
CrumblePath
*
q
);
QList
<
CrumblePathButton
*>
m_buttons
;
...
...
@@ -244,18 +245,18 @@ CrumblePath::~CrumblePath()
void
CrumblePath
::
selectIndex
(
int
index
)
{
if
(
(
index
>
-
1
)
&&
(
index
<
d
->
m_buttons
.
length
())
)
if
(
index
>
-
1
&&
index
<
d
->
m_buttons
.
length
())
d
->
m_buttons
[
index
]
->
select
(
true
);
}
QVariant
CrumblePath
::
dataForIndex
(
int
index
)
const
{
if
(
(
index
>
-
1
)
&&
(
index
<
d
->
m_buttons
.
length
())
)
if
(
index
>
-
1
&&
index
<
d
->
m_buttons
.
length
())
return
d
->
m_buttons
[
index
]
->
data
();
return
QVariant
();
}
void
CrumblePath
::
pushElement
(
const
QString
&
title
,
const
QVariant
data
)
void
CrumblePath
::
pushElement
(
const
QString
&
title
,
const
QVariant
&
data
)
{
CrumblePathButton
*
newButton
=
new
CrumblePathButton
(
title
,
this
);
newButton
->
hide
();
...
...
@@ -276,9 +277,9 @@ void CrumblePath::pushElement(const QString &title, const QVariant data)
resizeButtons
();
}
void
CrumblePath
::
addChild
(
const
QString
&
title
,
const
QVariant
data
)
void
CrumblePath
::
addChild
(
const
QString
&
title
,
const
QVariant
&
data
)
{
QTC_ASSERT
(
d
->
m_buttons
.
count
()
>
0
,
return
);
QTC_ASSERT
(
d
->
m_buttons
.
count
()
>
0
,
return
);
QPushButton
*
lastButton
=
d
->
m_buttons
.
last
();
...
...
@@ -311,9 +312,8 @@ void CrumblePath::popElement()
void
CrumblePath
::
clear
()
{
while
(
!
d
->
m_buttons
.
isEmpty
())
{
while
(
!
d
->
m_buttons
.
isEmpty
())
popElement
();
}
}
void
CrumblePath
::
resizeEvent
(
QResizeEvent
*
)
...
...
@@ -332,9 +332,9 @@ void CrumblePath::resizeButtons()
// rearrange all items so that the first item is on top (added last).
// compute relative sizes
QList
<
int
>
sizes
;
QList
<
int
>
sizes
;
int
totalSize
=
0
;
for
(
int
i
=
0
;
i
<
d
->
m_buttons
.
length
()
;
++
i
)
{
for
(
int
i
=
0
;
i
<
d
->
m_buttons
.
length
()
;
++
i
)
{
CrumblePathButton
*
button
=
d
->
m_buttons
[
i
];
QFontMetrics
fm
(
button
->
font
());
...
...
@@ -346,11 +346,11 @@ void CrumblePath::resizeButtons()
for
(
int
i
=
0
;
i
<
d
->
m_buttons
.
length
()
;
++
i
)
{
CrumblePathButton
*
button
=
d
->
m_buttons
[
i
];
int
candidateSize
=
(
sizes
[
i
]
*
totalWidthLeft
)
/
totalSize
;
int
candidateSize
=
(
sizes
[
i
]
*
totalWidthLeft
)
/
totalSize
;
if
(
candidateSize
<
ArrowBorderSize
)
candidateSize
=
ArrowBorderSize
;
if
(
candidateSize
>
sizes
[
i
]
*
1.3
)
candidateSize
=
sizes
[
i
]
*
1.3
;
if
(
candidateSize
>
sizes
[
i
]
*
1.3
)
candidateSize
=
sizes
[
i
]
*
1.3
;
button
->
setMinimumWidth
(
candidateSize
);
...
...
@@ -363,7 +363,6 @@ void CrumblePath::resizeButtons()
if
(
i
>
0
)
button
->
stackUnder
(
d
->
m_buttons
[
i
-
1
]);
}
}
}
...
...
src/libs/utils/crumblepath.h
View file @
4af3d9bd
...
...
@@ -55,8 +55,8 @@ public:
QVariant
dataForIndex
(
int
index
)
const
;
public
slots
:
void
pushElement
(
const
QString
&
title
,
const
QVariant
data
=
QVariant
());
void
addChild
(
const
QString
&
title
,
const
QVariant
data
=
QVariant
());
void
pushElement
(
const
QString
&
title
,
const
QVariant
&
data
=
QVariant
());
void
addChild
(
const
QString
&
title
,
const
QVariant
&
data
=
QVariant
());
void
popElement
();
void
clear
();
...
...
src/plugins/qmljsinspector/qmlinspectortoolbar.h
View file @
4af3d9bd
...
...
@@ -44,11 +44,11 @@ QT_FORWARD_DECLARE_CLASS(QColor)
QT_FORWARD_DECLARE_CLASS
(
QToolButton
)
namespace
Core
{
class
Context
;
class
Context
;
}
namespace
Utils
{
class
StyledBar
;
class
StyledBar
;
}
namespace
QmlJSInspector
{
...
...
src/plugins/qmljsinspector/qmljscontextcrumblepath.cpp
View file @
4af3d9bd
...
...
@@ -39,15 +39,11 @@ namespace QmlJSInspector {
namespace
Internal
{
ContextCrumblePath
::
ContextCrumblePath
(
QWidget
*
parent
)
:
CrumblePath
(
parent
),
m_isEmpty
(
true
)
:
CrumblePath
(
parent
)
,
m_isEmpty
(
true
)
{
setSizePolicy
(
QSizePolicy
::
Preferred
,
QSizePolicy
::
Preferred
);
updateContextPath
(
QStringList
(),
QList
<
int
>
());
}
ContextCrumblePath
::~
ContextCrumblePath
()
{
updateContextPath
(
QStringList
(),
QList
<
int
>
());
}
void
ContextCrumblePath
::
updateContextPath
(
const
QStringList
&
path
,
const
QList
<
int
>
&
debugIds
)
...
...
@@ -60,9 +56,8 @@ void ContextCrumblePath::updateContextPath(const QStringList &path, const QList<
if
(
m_isEmpty
)
{
pushElement
(
tr
(
"[no context]"
));
}
else
{
for
(
int
i
=
0
;
i
<
path
.
count
();
i
++
)
{
pushElement
(
path
[
i
],
QVariant
(
debugIds
[
i
]));
}
for
(
int
i
=
0
;
i
<
path
.
count
();
i
++
)
pushElement
(
path
[
i
],
QVariant
(
debugIds
[
i
]));
}
}
...
...
src/plugins/qmljsinspector/qmljscontextcrumblepath.h
View file @
4af3d9bd
...
...
@@ -42,9 +42,10 @@ namespace Internal {
class
ContextCrumblePath
:
public
Utils
::
CrumblePath
{
Q_OBJECT
public:
ContextCrumblePath
(
QWidget
*
parent
=
0
);
virtual
~
ContextCrumblePath
();
bool
isEmpty
()
const
;
int
debugIdForIndex
(
int
index
)
const
;
...
...
src/plugins/qmljsinspector/qmljsinspector.h
View file @
4af3d9bd
...
...
@@ -48,20 +48,20 @@
QT_FORWARD_DECLARE_CLASS
(
QLineEdit
)
namespace
ProjectExplorer
{
class
Project
;
class
Environment
;
class
Project
;
class
Environment
;
}
namespace
TextEditor
{
class
ITextEditor
;
class
ITextEditor
;
}
namespace
Core
{
class
IContext
;
class
IContext
;
}
namespace
QmlJS
{
class
ModelManagerInterface
;
class
ModelManagerInterface
;
}
namespace
QmlJSInspector
{
...
...
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