forked from qt-creator/qt-creator
Code cosmetics
This commit is contained in:
@@ -214,7 +214,8 @@ QVariant CrumblePathButton::data() const
|
|||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
struct CrumblePathPrivate {
|
struct CrumblePathPrivate
|
||||||
|
{
|
||||||
explicit CrumblePathPrivate(CrumblePath *q);
|
explicit CrumblePathPrivate(CrumblePath *q);
|
||||||
|
|
||||||
QList<CrumblePathButton*> m_buttons;
|
QList<CrumblePathButton*> m_buttons;
|
||||||
@@ -244,18 +245,18 @@ CrumblePath::~CrumblePath()
|
|||||||
|
|
||||||
void CrumblePath::selectIndex(int index)
|
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);
|
d->m_buttons[index]->select(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariant CrumblePath::dataForIndex(int index) const
|
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 d->m_buttons[index]->data();
|
||||||
return QVariant();
|
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);
|
CrumblePathButton *newButton = new CrumblePathButton(title, this);
|
||||||
newButton->hide();
|
newButton->hide();
|
||||||
@@ -276,9 +277,9 @@ void CrumblePath::pushElement(const QString &title, const QVariant data)
|
|||||||
resizeButtons();
|
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();
|
QPushButton *lastButton = d->m_buttons.last();
|
||||||
|
|
||||||
@@ -311,9 +312,8 @@ void CrumblePath::popElement()
|
|||||||
|
|
||||||
void CrumblePath::clear()
|
void CrumblePath::clear()
|
||||||
{
|
{
|
||||||
while (!d->m_buttons.isEmpty()) {
|
while (!d->m_buttons.isEmpty())
|
||||||
popElement();
|
popElement();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CrumblePath::resizeEvent(QResizeEvent *)
|
void CrumblePath::resizeEvent(QResizeEvent *)
|
||||||
@@ -332,9 +332,9 @@ void CrumblePath::resizeButtons()
|
|||||||
// rearrange all items so that the first item is on top (added last).
|
// rearrange all items so that the first item is on top (added last).
|
||||||
|
|
||||||
// compute relative sizes
|
// compute relative sizes
|
||||||
QList <int> sizes;
|
QList<int> sizes;
|
||||||
int totalSize = 0;
|
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];
|
CrumblePathButton *button = d->m_buttons[i];
|
||||||
|
|
||||||
QFontMetrics fm(button->font());
|
QFontMetrics fm(button->font());
|
||||||
@@ -346,11 +346,11 @@ void CrumblePath::resizeButtons()
|
|||||||
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];
|
CrumblePathButton *button = d->m_buttons[i];
|
||||||
|
|
||||||
int candidateSize = (sizes[i]*totalWidthLeft)/totalSize;
|
int candidateSize = (sizes[i] * totalWidthLeft) / totalSize;
|
||||||
if (candidateSize < ArrowBorderSize)
|
if (candidateSize < ArrowBorderSize)
|
||||||
candidateSize = ArrowBorderSize;
|
candidateSize = ArrowBorderSize;
|
||||||
if (candidateSize > sizes[i]*1.3)
|
if (candidateSize > sizes[i] * 1.3)
|
||||||
candidateSize = sizes[i]*1.3;
|
candidateSize = sizes[i] * 1.3;
|
||||||
|
|
||||||
|
|
||||||
button->setMinimumWidth(candidateSize);
|
button->setMinimumWidth(candidateSize);
|
||||||
@@ -363,7 +363,6 @@ void CrumblePath::resizeButtons()
|
|||||||
if (i > 0)
|
if (i > 0)
|
||||||
button->stackUnder(d->m_buttons[i - 1]);
|
button->stackUnder(d->m_buttons[i - 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,8 +55,8 @@ public:
|
|||||||
QVariant dataForIndex(int index) const;
|
QVariant dataForIndex(int index) const;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void pushElement(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 addChild(const QString &title, const QVariant &data = QVariant());
|
||||||
void popElement();
|
void popElement();
|
||||||
void clear();
|
void clear();
|
||||||
|
|
||||||
|
|||||||
@@ -44,11 +44,11 @@ QT_FORWARD_DECLARE_CLASS(QColor)
|
|||||||
QT_FORWARD_DECLARE_CLASS(QToolButton)
|
QT_FORWARD_DECLARE_CLASS(QToolButton)
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class Context;
|
class Context;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Utils {
|
namespace Utils {
|
||||||
class StyledBar;
|
class StyledBar;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace QmlJSInspector {
|
namespace QmlJSInspector {
|
||||||
|
|||||||
@@ -39,15 +39,11 @@ namespace QmlJSInspector {
|
|||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
|
||||||
ContextCrumblePath::ContextCrumblePath(QWidget *parent)
|
ContextCrumblePath::ContextCrumblePath(QWidget *parent)
|
||||||
: CrumblePath(parent), m_isEmpty(true)
|
: CrumblePath(parent)
|
||||||
|
, m_isEmpty(true)
|
||||||
{
|
{
|
||||||
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||||
updateContextPath(QStringList(),QList<int>());
|
updateContextPath(QStringList(), QList<int>());
|
||||||
}
|
|
||||||
|
|
||||||
ContextCrumblePath::~ContextCrumblePath()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ContextCrumblePath::updateContextPath(const QStringList &path, const QList<int> &debugIds)
|
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) {
|
if (m_isEmpty) {
|
||||||
pushElement(tr("[no context]"));
|
pushElement(tr("[no context]"));
|
||||||
} else {
|
} else {
|
||||||
for (int i=0; i<path.count(); i++) {
|
for (int i=0; i<path.count(); i++)
|
||||||
pushElement(path[i],QVariant(debugIds[i]));
|
pushElement(path[i], QVariant(debugIds[i]));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,9 +42,10 @@ namespace Internal {
|
|||||||
class ContextCrumblePath : public Utils::CrumblePath
|
class ContextCrumblePath : public Utils::CrumblePath
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ContextCrumblePath(QWidget *parent = 0);
|
ContextCrumblePath(QWidget *parent = 0);
|
||||||
virtual ~ContextCrumblePath();
|
|
||||||
bool isEmpty() const;
|
bool isEmpty() const;
|
||||||
int debugIdForIndex(int index) const;
|
int debugIdForIndex(int index) const;
|
||||||
|
|
||||||
|
|||||||
@@ -48,20 +48,20 @@
|
|||||||
QT_FORWARD_DECLARE_CLASS(QLineEdit)
|
QT_FORWARD_DECLARE_CLASS(QLineEdit)
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
class Project;
|
class Project;
|
||||||
class Environment;
|
class Environment;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace TextEditor {
|
namespace TextEditor {
|
||||||
class ITextEditor;
|
class ITextEditor;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class IContext;
|
class IContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace QmlJS {
|
namespace QmlJS {
|
||||||
class ModelManagerInterface;
|
class ModelManagerInterface;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace QmlJSInspector {
|
namespace QmlJSInspector {
|
||||||
|
|||||||
Reference in New Issue
Block a user