feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
- Add missing translations
- Remove some unneeded conversions.

Change-Id: Ia30e5c838099e52a9f38ca4854395c10c0391075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-09 16:30:33 +01:00
parent ed2f41bb58
commit ced6fc4136
40 changed files with 352 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -134,7 +134,7 @@ void TargetSelectorDelegate::paint(QPainter *painter,
if (elidedText != text)
const_cast<QAbstractItemModel *>(index.model())->setData(index, text, Qt::ToolTipRole);
else
const_cast<QAbstractItemModel *>(index.model())->setData(index, "", Qt::ToolTipRole);
const_cast<QAbstractItemModel *>(index.model())->setData(index, QString(), Qt::ToolTipRole);
painter->drawText(option.rect.left() + 6, option.rect.top() + (option.rect.height() - fm.height()) / 2 + fm.ascent(), elidedText);
painter->restore();
@@ -165,7 +165,7 @@ QSize ListWidget::sizeHint() const
// We try to keep the height of the popup equal to the actionbar
QSize size(width, height);
static QStatusBar *statusBar = Core::ICore::instance()->statusBar();
static QWidget *actionBar = Core::ICore::instance()->mainWindow()->findChild<QWidget*>("actionbar");
static QWidget *actionBar = Core::ICore::instance()->mainWindow()->findChild<QWidget*>(QLatin1String("actionbar"));
Q_ASSERT(actionBar);
QMargins popupMargins = window()->contentsMargins();
@@ -991,7 +991,7 @@ void MiniProjectTargetSelector::keyReleaseEvent(QKeyEvent *ke)
QSize MiniProjectTargetSelector::sizeHint() const
{
static QStatusBar *statusBar = Core::ICore::instance()->statusBar();
static QWidget *actionBar = Core::ICore::instance()->mainWindow()->findChild<QWidget*>("actionbar");
static QWidget *actionBar = Core::ICore::instance()->mainWindow()->findChild<QWidget*>(QLatin1String("actionbar"));
Q_ASSERT(actionBar);
int alignedWithActionHeight