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

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
This commit is contained in:
dt
2008-12-09 14:18:09 +01:00
parent 7d4dab15a5 56133d4f4f
commit b33cf9b4cd
117 changed files with 820 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/bineditor/bineditor.cpp
View File

@@ -222,7 +222,7 @@ void BinEditor::scrollContentsBy(int dx, int dy)
void BinEditor::changeEvent(QEvent *e)
{
QAbstractScrollArea::changeEvent(e);
if(e->type() == QEvent::ActivationChange) {
if (e->type() == QEvent::ActivationChange) {
if (!isActiveWindow())
m_autoScrollTimer.stop();
}
@@ -450,7 +450,7 @@ void BinEditor::paintEvent(QPaintEvent *e)
for (int c = 0; c < 16; ++c) {
int pos = line * 16 + c;
if (pos >= m_data.size()) {
while(c < 16) {
while (c < 16) {
itemStringData[c*3] = itemStringData[c*3+1] = ' ';
++c;
}

2
src/plugins/bookmarks/bookmarkmanager.cpp
View File

@@ -173,7 +173,7 @@ void BookmarkDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
// int idx;
// forever {
// idx = directory.lastIndexOf("/", pos-1);
// if(idx == -1) {
// if (idx == -1) {
// // Can't happen, this means the string did fit after all?
// break;
// }

28
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -63,7 +63,7 @@ CMakeProject::CMakeProject(CMakeManager *manager, const QString &fileName)
if (cbpparser.parseCbpFile(cbpFile)) {
// TODO do a intelligent updating of the tree
buildTree(m_rootNode, cbpparser.fileList());
foreach(ProjectExplorer::FileNode *fn, cbpparser.fileList())
foreach (ProjectExplorer::FileNode *fn, cbpparser.fileList())
m_files.append(fn->path());
m_files.sort();
@@ -102,11 +102,9 @@ QString CMakeProject::findCbpFile(const QDir &directory)
// TODO the cbp file is named like the project() command in the CMakeList.txt file
// so this method below could find the wrong cbp file, if the user changes the project()
// name
foreach(const QString &cbpFile , directory.entryList())
{
if (cbpFile.endsWith(".cbp")) {
foreach (const QString &cbpFile , directory.entryList()) {
if (cbpFile.endsWith(".cbp"))
return directory.path() + "/" + cbpFile;
}
}
return QString::null;
}
@@ -132,7 +130,7 @@ void CMakeProject::buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::
{
//m_rootNode->addFileNodes(fileList, m_rootNode);
qSort(list.begin(), list.end(), ProjectExplorer::ProjectNode::sortNodesByPath);
foreach( ProjectExplorer::FileNode *fn, list) {
foreach (ProjectExplorer::FileNode *fn, list) {
// Get relative path to rootNode
QString parentDir = QFileInfo(fn->path()).absolutePath();
ProjectExplorer::FolderNode *folder = findOrCreateFolder(rootNode, parentDir);
@@ -146,10 +144,10 @@ ProjectExplorer::FolderNode *CMakeProject::findOrCreateFolder(CMakeProjectNode *
QString relativePath = QDir(QFileInfo(rootNode->path()).path()).relativeFilePath(directory);
QStringList parts = relativePath.split("/");
ProjectExplorer::FolderNode *parent = rootNode;
foreach(const QString &part, parts) {
foreach (const QString &part, parts) {
// Find folder in subFolders
bool found = false;
foreach(ProjectExplorer::FolderNode *folder, parent->subFolderNodes()) {
foreach (ProjectExplorer::FolderNode *folder, parent->subFolderNodes()) {
if (QFileInfo(folder->path()).fileName() == part) {
// yeah found something :)
parent = folder;
@@ -359,7 +357,7 @@ bool CMakeCbpParser::parseCbpFile(const QString &fileName)
if (fi.exists() && fi.open(QFile::ReadOnly)) {
setDevice(&fi);
while(!atEnd()) {
while (!atEnd()) {
readNext();
if (name() == "CodeBlocks_project_file") {
parseCodeBlocks_project_file();
@@ -377,7 +375,7 @@ bool CMakeCbpParser::parseCbpFile(const QString &fileName)
void CMakeCbpParser::parseCodeBlocks_project_file()
{
while(!atEnd()) {
while (!atEnd()) {
readNext();
if (isEndElement()) {
return;
@@ -391,7 +389,7 @@ void CMakeCbpParser::parseCodeBlocks_project_file()
void CMakeCbpParser::parseProject()
{
while(!atEnd()) {
while (!atEnd()) {
readNext();
if (isEndElement()) {
return;
@@ -407,7 +405,7 @@ void CMakeCbpParser::parseProject()
void CMakeCbpParser::parseBuild()
{
while(!atEnd()) {
while (!atEnd()) {
readNext();
if (isEndElement()) {
return;
@@ -509,7 +507,7 @@ void CMakeCbpParser::parseTargetClean()
void CMakeCbpParser::parseCompiler()
{
while(!atEnd()) {
while (!atEnd()) {
readNext();
if (isEndElement()) {
return;
@@ -524,7 +522,7 @@ void CMakeCbpParser::parseCompiler()
void CMakeCbpParser::parseAdd()
{
m_includeFiles.append(attributes().value("directory").toString());
while(!atEnd()) {
while (!atEnd()) {
readNext();
if (isEndElement()) {
return;
@@ -540,7 +538,7 @@ void CMakeCbpParser::parseUnit()
QString fileName = attributes().value("filename").toString();
if (!fileName.endsWith(".rule"))
m_fileList.append( new ProjectExplorer::FileNode(fileName, ProjectExplorer::SourceType, false));
while(!atEnd()) {
while (!atEnd()) {
readNext();
if (isEndElement()) {
return;

4
src/plugins/coreplugin/basefilewizard.cpp
View File

@@ -456,7 +456,7 @@ QStringList BaseFileWizard::runWizard(const QString &path, QWidget *parent)
}
}
if (firstExtensionPageHit)
foreach(IFileWizardExtension *ex, extensions)
foreach (IFileWizardExtension *ex, extensions)
ex->firstExtensionPageShown(files);
if (accepted)
break;
@@ -486,7 +486,7 @@ QStringList BaseFileWizard::runWizard(const QString &path, QWidget *parent)
}
}
// Run the extensions
foreach(IFileWizardExtension *ex, extensions)
foreach (IFileWizardExtension *ex, extensions)
if (!ex->process(files, &errorMessage)) {
QMessageBox::critical(parent, tr("File Generation Failure"), errorMessage);
return QStringList();

8
src/plugins/coreplugin/dialogs/settingsdialog.cpp
View File

@@ -58,7 +58,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &initialCategory,
CoreImpl::instance()->pluginManager()->getObjects<IOptionsPage>();
int index = 0;
foreach(IOptionsPage *page, pages) {
foreach (IOptionsPage *page, pages) {
QTreeWidgetItem *item = new QTreeWidgetItem();
item->setText(0, page->name());
item->setData(0, Qt::UserRole, index);
@@ -77,7 +77,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &initialCategory,
int catCount = 1;
while (catCount < categoriesId.count()) {
if(!categories.contains(currentCategory + QLatin1Char('|') + categoriesId.at(catCount))) {
if (!categories.contains(currentCategory + QLatin1Char('|') + categoriesId.at(catCount))) {
treeitem = new QTreeWidgetItem(categories.value(currentCategory));
currentCategory += QLatin1Char('|') + categoriesId.at(catCount);
treeitem->setText(0, trCategories.at(catCount));
@@ -123,14 +123,14 @@ void SettingsDialog::pageSelected(QTreeWidgetItem *)
void SettingsDialog::accept()
{
foreach(IOptionsPage *page, m_pages)
foreach (IOptionsPage *page, m_pages)
page->finished(true);
done(QDialog::Accepted);
}
void SettingsDialog::reject()
{
foreach(IOptionsPage *page, m_pages)
foreach (IOptionsPage *page, m_pages)
page->finished(false);
done(QDialog::Rejected);
}

8
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View File

@@ -123,7 +123,7 @@ QWidget *ShortcutSettings::createPage(QWidget *parent)
void ShortcutSettings::finished(bool accepted)
{
if (accepted) {
foreach(ShortcutItem *item, m_scitems) {
foreach (ShortcutItem *item, m_scitems) {
item->m_cmd->setKeySequence(item->m_key);
}
}
@@ -196,7 +196,7 @@ bool ShortcutSettings::filter(const QString &f, const QTreeWidgetItem *item)
if (f.isEmpty())
return false;
for (int i = 0; i < item->columnCount(); ++i) {
if(item->text(i).contains(f, Qt::CaseInsensitive))
if (item->text(i).contains(f, Qt::CaseInsensitive))
return false;
}
return true;
@@ -242,7 +242,7 @@ void ShortcutSettings::importAction()
CommandsFile cf(fileName);
QMap<QString, QKeySequence> mapping = cf.importCommands();
foreach(ShortcutItem *item, m_scitems) {
foreach (ShortcutItem *item, m_scitems) {
QString sid = uidm->stringForUniqueIdentifier(item->m_cmd->id());
if (mapping.contains(sid)) {
item->m_key = mapping.value(sid);
@@ -256,7 +256,7 @@ void ShortcutSettings::importAction()
void ShortcutSettings::defaultAction()
{
foreach(ShortcutItem *item, m_scitems) {
foreach (ShortcutItem *item, m_scitems) {
item->m_key = item->m_cmd->defaultKeySequence();
item->m_item->setText(2, item->m_key);
if (item->m_item == m_page->commandList->currentItem())

2
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1089,7 +1089,7 @@ bool EditorManager::saveFileAs(IEditor *editor)
const bool success = editor->file()->save(absoluteFilePath);
m_d->m_core->fileManager()->unblockFileChange(editor->file());
if(success)
if (success)
m_d->m_core->fileManager()->addToRecentFiles(editor->file()->fileName());
updateActions();

2
src/plugins/coreplugin/editormanager/openeditorsview.cpp
View File

@@ -70,7 +70,7 @@ OpenEditorsWidget::OpenEditorsWidget()
m_ui.editorList->installEventFilter(this);
m_ui.editorList->setFrameStyle(QFrame::NoFrame);
EditorManager *em = EditorManager::instance();
foreach(IEditor *editor, em->openedEditors()) {
foreach (IEditor *editor, em->openedEditors()) {
registerEditor(editor);
}
connect(em, SIGNAL(editorOpened(Core::IEditor*)),

4
src/plugins/coreplugin/fileiconprovider.cpp
View File

@@ -96,7 +96,7 @@ void FileIconProvider::registerIconForSuffix(const QIcon &icon, const QString &s
{
// delete old icon, if it exists
QList<QPair<QString,QIcon> >::iterator iter = m_cache.begin();
for(; iter != m_cache.end(); ++iter) {
for (; iter != m_cache.end(); ++iter) {
if ((*iter).first == suffix) {
iter = m_cache.erase(iter);
break;
@@ -118,7 +118,7 @@ QIcon FileIconProvider::iconForSuffix(const QString &suffix) const
return icon;
QList<QPair<QString,QIcon> >::const_iterator iter = m_cache.constBegin();
for(; iter != m_cache.constEnd(); ++iter) {
for (; iter != m_cache.constEnd(); ++iter) {
if ((*iter).first == suffix) {
icon = (*iter).second;
break;

7
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -896,7 +896,7 @@ void MainWindow::removeContextObject(IContext *context)
return;
m_contextWidgets.remove(widget);
if(m_activeContext == context)
if (m_activeContext == context)
updateContextObject(0);
}
@@ -957,10 +957,11 @@ void MainWindow::resetContext()
updateContextObject(0);
}
QMenu *MainWindow::createPopupMenu() {
QMenu *MainWindow::createPopupMenu()
{
QMenu *menu = new QMenu(this);
QList<ActionContainer *> containers = m_actionManager->containers();
foreach(ActionContainer *c, containers) {
foreach (ActionContainer *c, containers) {
if (c->toolBar())
menu->addAction(c->toolBar()->toggleViewAction());
}

2
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -140,7 +140,7 @@ void drawCornerImage(const QImage &img, QPainter *painter, QRect rect,
if (top > 0) { //top
painter->drawImage(QRect(rect.left() + left, rect.top(), rect.width() -right - left, top), img,
QRect(left, 0, size.width() -right - left, top));
if(left > 0) //top-left
if (left > 0) //top-left
painter->drawImage(QRect(rect.left(), rect.top(), left, top), img,
QRect(0, 0, left, top));
if (right > 0) //top-right

2
src/plugins/coreplugin/mimedatabase.cpp
View File

@@ -299,7 +299,7 @@ void MimeTypeData::debug(QTextStream &str, int indent) const
str << indentS << "SubClassesOf: " << subClassesOf.join(comma) << '\n';
if (!globPatterns.empty()) {
str << indentS << "Glob: ";
foreach(const QRegExp &r, globPatterns)
foreach (const QRegExp &r, globPatterns)
str << r.pattern() << ' ';
str << '\n';
if (!suffixes.empty()) {

4
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -87,8 +87,8 @@ void NavigationWidgetPlaceHolder::applyStoredSize(int width)
QList<int> sizes = splitter->sizes();
int index = splitter->indexOf(this);
int diff = width - sizes.at(index);
int adjust = sizes.count() > 1? ( diff / (sizes.count() - 1)) : 0;
for(int i=0; i<sizes.count(); ++i) {
int adjust = sizes.count() > 1 ? (diff / (sizes.count() - 1)) : 0;
for (int i = 0; i < sizes.count(); ++i) {
if (i != index)
sizes[i] += adjust;
}

4
src/plugins/coreplugin/outputpane.cpp
View File

@@ -277,7 +277,7 @@ void OutputPane::init(ICore *core, ExtensionSystem::PluginManager *pm)
connect(cmd->action(), SIGNAL(triggered()), this, SLOT(shortcutTriggered()));
connect(cmd->action(), SIGNAL(changed()), this, SLOT(updateToolTip()));
} while(it != begin);
} while (it != begin);
changePage();
}
@@ -293,7 +293,7 @@ void OutputPane::shortcutTriggered()
// but the outputpane doesn't have focus
// then just give it focus
// else do the same as clicking on the button does
if(OutputPanePlaceHolder::m_current
if (OutputPanePlaceHolder::m_current
&& OutputPanePlaceHolder::m_current->isVisible()
&& m_widgetComboBox->itemData(m_widgetComboBox->currentIndex()).toInt() == idx) {
if (!outputPane->hasFocus() && outputPane->canFocus())

4
src/plugins/coreplugin/progressmanager/progresspie.cpp
View File

@@ -101,9 +101,9 @@ void ProgressBar::paintEvent(QPaintEvent *)
double percent = 0.50;
if (range != 0)
percent = (value() - minimum()) / range;
if(percent > 1)
if (percent > 1)
percent = 1;
else if(percent < 0)
else if (percent < 0)
percent = 0;
QPainter p(this);

6
src/plugins/coreplugin/rightpane.cpp
View File

@@ -76,8 +76,8 @@ void RightPanePlaceHolder::applyStoredSize(int width)
QList<int> sizes = splitter->sizes();
int index = splitter->indexOf(this);
int diff = width - sizes.at(index);
int adjust = sizes.count() > 1? ( diff / (sizes.count() - 1)) : 0;
for(int i=0; i<sizes.count(); ++i) {
int adjust = sizes.count() > 1 ? (diff / (sizes.count() - 1)) : 0;
for (int i = 0; i < sizes.count(); ++i) {
if (i != index)
sizes[i] -= adjust;
}
@@ -125,7 +125,7 @@ void RightPanePlaceHolder::currentModeChanged(Core::IMode *mode)
RightPaneWidget *RightPaneWidget::m_instance = 0;
RightPaneWidget::RightPaneWidget()
:m_shown(true), m_width(0)
: m_shown(true), m_width(0)
{
m_instance = this;

5
src/plugins/coreplugin/styleanimator.cpp
View File

@@ -52,7 +52,8 @@ void Animation::paint(QPainter *painter, const QStyleOption *option)
Q_UNUSED(painter);
}
void Animation::drawBlendedImage(QPainter *painter, QRect rect, float alpha) {
void Animation::drawBlendedImage(QPainter *painter, QRect rect, float alpha)
{
if (_secondaryImage.isNull() || _primaryImage.isNull())
return;
@@ -64,7 +65,7 @@ void Animation::drawBlendedImage(QPainter *painter, QRect rect, float alpha) {
const int sw = _primaryImage.width();
const int sh = _primaryImage.height();
const int bpl = _primaryImage.bytesPerLine();
switch(_primaryImage.depth()) {
switch (_primaryImage.depth()) {
case 32:
{
uchar *mixed_data = _tempImage.bits();

8
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -77,7 +77,7 @@ void VCSManager::setVCSEnabled(const QString &directory)
qDebug() << Q_FUNC_INFO << directory;
IVersionControl* managingVCS = findVersionControlForDirectory(directory);
const VersionControlList versionControls = allVersionControls();
foreach(IVersionControl *versionControl, versionControls) {
foreach (IVersionControl *versionControl, versionControls) {
const bool newEnabled = versionControl == managingVCS;
if (newEnabled != versionControl->isEnabled())
versionControl->setEnabled(newEnabled);
@@ -89,7 +89,7 @@ void VCSManager::setAllVCSEnabled()
if (debug)
qDebug() << Q_FUNC_INFO;
const VersionControlList versionControls = allVersionControls();
foreach(IVersionControl *versionControl, versionControls)
foreach (IVersionControl *versionControl, versionControls)
if (!versionControl->isEnabled())
versionControl->setEnabled(true);
}
@@ -106,7 +106,7 @@ IVersionControl* VCSManager::findVersionControlForDirectory(const QString &direc
int pos = 0;
const QChar slash = QLatin1Char('/');
while(true) {
while (true) {
int index = directory.indexOf(slash, pos);
if (index == -1)
break;
@@ -119,7 +119,7 @@ IVersionControl* VCSManager::findVersionControlForDirectory(const QString &direc
// ah nothing so ask the IVersionControls directly
const VersionControlList versionControls = allVersionControls();
foreach(IVersionControl * versionControl, versionControls) {
foreach (IVersionControl * versionControl, versionControls) {
if (versionControl->managesDirectory(directory)) {
m_d->m_cachedMatches.insert(versionControl->findTopLevelForDirectory(directory), versionControl);
return versionControl;

23
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -203,9 +203,7 @@ void CPPEditor::createToolBar(CPPEditorEditable *editable)
m_methodCombo->setMaxVisibleItems(20);
m_overviewModel = new OverviewModel(this);
m_noSymbolsModel = new QStringListModel(this);
m_noSymbolsModel->setStringList(QStringList() << tr("<no symbols>"));
m_methodCombo->setModel(m_noSymbolsModel);
m_methodCombo->setModel(m_overviewModel);
connect(m_methodCombo, SIGNAL(activated(int)), this, SLOT(jumpToMethod(int)));
connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(updateMethodBoxIndex()));
@@ -318,16 +316,9 @@ void CPPEditor::onDocumentUpdated(Document::Ptr doc)
return;
m_overviewModel->rebuild(doc);
if (m_overviewModel->rowCount() > 0) {
if (m_methodCombo->model() != m_overviewModel)
m_methodCombo->setModel(m_overviewModel);
OverviewTreeView *treeView = static_cast<OverviewTreeView *>(m_methodCombo->view());
treeView->sync();
updateMethodBoxIndex();
} else {
if (m_methodCombo->model() != m_noSymbolsModel)
m_methodCombo->setModel(m_noSymbolsModel);
}
OverviewTreeView *treeView = static_cast<OverviewTreeView *>(m_methodCombo->view());
treeView->sync();
updateMethodBoxIndex();
}
void CPPEditor::updateFileName()
@@ -335,8 +326,6 @@ void CPPEditor::updateFileName()
void CPPEditor::jumpToMethod(int)
{
if (m_methodCombo->model() != m_overviewModel)
return;
QModelIndex index = m_methodCombo->view()->currentIndex();
Symbol *symbol = m_overviewModel->symbolFromIndex(index);
if (! symbol)
@@ -351,8 +340,6 @@ void CPPEditor::jumpToMethod(int)
void CPPEditor::updateMethodBoxIndex()
{
if (m_methodCombo->model() != m_overviewModel)
return;
int line = 0, column = 0;
convertPosition(position(), &line, &column);
@@ -362,7 +349,7 @@ void CPPEditor::updateMethodBoxIndex()
for (int row = 0; row < rc; ++row) {
const QModelIndex index = m_overviewModel->index(row, 0, QModelIndex());
Symbol *symbol = m_overviewModel->symbolFromIndex(index);
if (symbol->line() > unsigned(line))
if (symbol && symbol->line() > unsigned(line))
break;
lastIndex = index;
}

1
src/plugins/cppeditor/cppeditor.h
View File

@@ -139,7 +139,6 @@ private:
QList<int> m_contexts;
QComboBox *m_methodCombo;
CPlusPlus::OverviewModel *m_overviewModel;
QStringListModel *m_noSymbolsModel;
};
} // namespace Internal

24
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -115,7 +115,6 @@ public:
void setWorkingCopy(const QMap<QString, QByteArray> &workingCopy);
void setIncludePaths(const QStringList &includePaths);
void setFrameworkPaths(const QStringList &frameworkPaths);
void addIncludePath(const QString &path);
void setProjectFiles(const QStringList &files);
void run(QString &fileName);
void operator()(QString &fileName);
@@ -170,9 +169,6 @@ void CppPreprocessor::setIncludePaths(const QStringList &includePaths)
void CppPreprocessor::setFrameworkPaths(const QStringList &frameworkPaths)
{ m_frameworkPaths = frameworkPaths; }
void CppPreprocessor::addIncludePath(const QString &path)
{ m_includePaths.append(path); }
void CppPreprocessor::setProjectFiles(const QStringList &files)
{ m_projectFiles = files; }
@@ -488,14 +484,14 @@ void CppModelManager::ensureUpdated()
if (! m_dirty)
return;
m_projectFiles = updateProjectFiles();
m_includePaths = updateIncludePaths();
m_frameworkPaths = updateFrameworkPaths();
m_definedMacros = updateDefinedMacros();
m_projectFiles = internalProjectFiles();
m_includePaths = internalIncludePaths();
m_frameworkPaths = internalFrameworkPaths();
m_definedMacros = internalDefinedMacros();
m_dirty = false;
}
QStringList CppModelManager::updateProjectFiles() const
QStringList CppModelManager::internalProjectFiles() const
{
QStringList files;
QMapIterator<ProjectExplorer::Project *, ProjectInfo> it(m_projects);
@@ -504,10 +500,11 @@ QStringList CppModelManager::updateProjectFiles() const
ProjectInfo pinfo = it.value();
files += pinfo.sourceFiles;
}
files.removeDuplicates();
return files;
}
QStringList CppModelManager::updateIncludePaths() const
QStringList CppModelManager::internalIncludePaths() const
{
QStringList includePaths;
QMapIterator<ProjectExplorer::Project *, ProjectInfo> it(m_projects);
@@ -516,10 +513,11 @@ QStringList CppModelManager::updateIncludePaths() const
ProjectInfo pinfo = it.value();
includePaths += pinfo.includePaths;
}
includePaths.removeDuplicates();
return includePaths;
}
QStringList CppModelManager::updateFrameworkPaths() const
QStringList CppModelManager::internalFrameworkPaths() const
{
QStringList frameworkPaths;
QMapIterator<ProjectExplorer::Project *, ProjectInfo> it(m_projects);
@@ -528,10 +526,11 @@ QStringList CppModelManager::updateFrameworkPaths() const
ProjectInfo pinfo = it.value();
frameworkPaths += pinfo.frameworkPaths;
}
frameworkPaths.removeDuplicates();
return frameworkPaths;
}
QByteArray CppModelManager::updateDefinedMacros() const
QByteArray CppModelManager::internalDefinedMacros() const
{
QByteArray macros;
QMapIterator<ProjectExplorer::Project *, ProjectInfo> it(m_projects);
@@ -588,6 +587,7 @@ void CppModelManager::updateProjectInfo(const ProjectInfo &pinfo)
return;
m_projects.insert(pinfo.project, pinfo);
m_dirty = true;
}
QFuture<void> CppModelManager::refreshSourceFiles(const QStringList &sourceFiles)

8
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -133,10 +133,10 @@ private:
}
void ensureUpdated();
QStringList updateProjectFiles() const;
QStringList updateIncludePaths() const;
QStringList updateFrameworkPaths() const;
QByteArray updateDefinedMacros() const;
QStringList internalProjectFiles() const;
QStringList internalIncludePaths() const;
QStringList internalFrameworkPaths() const;
QByteArray internalDefinedMacros() const;
static void parse(QFutureInterface<void> &future,
CppPreprocessor *preproc,

46
src/plugins/debugger/assert.h
View File

@@ -1,46 +0,0 @@
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** http://www.gnu.org/copyleft/gpl.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception
** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
#ifndef DEBUGGER_QWB_ASSERT_H
#define DEBUGGER_QWB_ASSERT_H
#ifdef Q_OS_UNIX
#define QWB_ASSERT(cond, action) \
if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED"<<__FILE__<<__LINE__;action;}
#else
#define QWB_ASSERT(cond, action) \
if(cond){}else{qDebug()<<"ASSERTION"<<#cond<<"FAILED";action;}
#endif
#endif // DEBUGGER_QWB_ASSERT_H

77
src/plugins/debugger/attachexternaldialog.cpp
View File

@@ -152,13 +152,12 @@ void AttachExternalDialog::rebuildProcessList()
#ifdef Q_OS_WINDOWS
// Forward declarations:
BOOL GetProcessList( );
BOOL ListProcessModules( DWORD dwPID );
BOOL ListProcessThreads( DWORD dwOwnerPID );
void printError( TCHAR* msg );
BOOL GetProcessList();
BOOL ListProcessModules(DWORD dwPID);
BOOL ListProcessThreads(DWORD dwOwnerPID);
void printError(TCHAR *msg);
BOOL GetProcessList( )
BOOL GetProcessList()
{
HANDLE hProcessSnap;
HANDLE hProcess;
@@ -167,7 +166,7 @@ BOOL GetProcessList( )
// Take a snapshot of all processes in the system.
hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
if( hProcessSnap == INVALID_HANDLE_VALUE )
if (hProcessSnap == INVALID_HANDLE_VALUE)
{
printError( TEXT("CreateToolhelp32Snapshot (of processes)") );
return( FALSE );
@@ -178,7 +177,7 @@ BOOL GetProcessList( )
// Retrieve information about the first process,
// and exit if unsuccessful
if( !Process32First( hProcessSnap, &pe32 ) )
if (!Process32First( hProcessSnap, &pe32 ))
{
printError( TEXT("Process32First") ); // show cause of failure
CloseHandle( hProcessSnap ); // clean the snapshot object
@@ -196,12 +195,12 @@ BOOL GetProcessList( )
// Retrieve the priority class.
dwPriorityClass = 0;
hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, pe32.th32ProcessID );
if( hProcess == NULL )
if (hProcess == NULL)
printError( TEXT("OpenProcess") );
else
{
dwPriorityClass = GetPriorityClass( hProcess );
if( !dwPriorityClass )
if (!dwPriorityClass)
printError( TEXT("GetPriorityClass") );
CloseHandle( hProcess );
}
@@ -210,31 +209,30 @@ BOOL GetProcessList( )
printf( "\n Thread count = %d", pe32.cntThreads );
printf( "\n Parent process ID = 0x%08X", pe32.th32ParentProcessID );
printf( "\n Priority base = %d", pe32.pcPriClassBase );
if( dwPriorityClass )
if (dwPriorityClass)
printf( "\n Priority class = %d", dwPriorityClass );
// List the modules and threads associated with this process
ListProcessModules( pe32.th32ProcessID );
ListProcessThreads( pe32.th32ProcessID );
} while( Process32Next( hProcessSnap, &pe32 ) );
} while (Process32Next(hProcessSnap, &pe32));
CloseHandle( hProcessSnap );
return( TRUE );
CloseHandle(hProcessSnap);
return TRUE;
}
BOOL ListProcessModules( DWORD dwPID )
BOOL ListProcessModules(DWORD dwPID)
{
HANDLE hModuleSnap = INVALID_HANDLE_VALUE;
MODULEENTRY32 me32;
// Take a snapshot of all modules in the specified process.
hModuleSnap = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, dwPID );
if( hModuleSnap == INVALID_HANDLE_VALUE )
{
printError( TEXT("CreateToolhelp32Snapshot (of modules)") );
return( FALSE );
if (hModuleSnap == INVALID_HANDLE_VALUE) {
printError(TEXT("CreateToolhelp32Snapshot (of modules)"));
return FALSE;
}
// Set the size of the structure before using it.
@@ -242,7 +240,7 @@ BOOL ListProcessModules( DWORD dwPID )
// Retrieve information about the first module,
// and exit if unsuccessful
if( !Module32First( hModuleSnap, &me32 ) )
if (!Module32First( hModuleSnap, &me32))
{
printError( TEXT("Module32First") ); // show cause of failure
CloseHandle( hModuleSnap ); // clean the snapshot object
@@ -261,10 +259,10 @@ BOOL ListProcessModules( DWORD dwPID )
printf( "\n Base address = 0x%08X", (DWORD) me32.modBaseAddr );
printf( "\n Base size = %d", me32.modBaseSize );
} while( Module32Next( hModuleSnap, &me32 ) );
} while (Module32Next(hModuleSnap, &me32));
CloseHandle( hModuleSnap );
return( TRUE );
CloseHandle(hModuleSnap);
return TRUE;
}
BOOL ListProcessThreads( DWORD dwOwnerPID )
@@ -274,7 +272,7 @@ BOOL ListProcessThreads( DWORD dwOwnerPID )
// Take a snapshot of all running threads
hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
if( hThreadSnap == INVALID_HANDLE_VALUE )
if (hThreadSnap == INVALID_HANDLE_VALUE)
return( FALSE );
// Fill in the size of the structure before using it.
@@ -282,7 +280,7 @@ BOOL ListProcessThreads( DWORD dwOwnerPID )
// Retrieve information about the first thread,
// and exit if unsuccessful
if( !Thread32First( hThreadSnap, &te32 ) )
if (!Thread32First( hThreadSnap, &te32 ))
{
printError( TEXT("Thread32First") ); // show cause of failure
CloseHandle( hThreadSnap ); // clean the snapshot object
@@ -294,13 +292,13 @@ BOOL ListProcessThreads( DWORD dwOwnerPID )
// associated with the specified process
do
{
if( te32.th32OwnerProcessID == dwOwnerPID )
if (te32.th32OwnerProcessID == dwOwnerPID)
{
printf( "\n\n THREAD ID = 0x%08X", te32.th32ThreadID );
printf( "\n Base priority = %d", te32.tpBasePri );
printf( "\n Delta priority = %d", te32.tpDeltaPri );
}
} while( Thread32Next(hThreadSnap, &te32 ) );
} while (Thread32Next(hThreadSnap, &te32));
CloseHandle( hThreadSnap );
return( TRUE );
@@ -308,22 +306,24 @@ BOOL ListProcessThreads( DWORD dwOwnerPID )
void printError( TCHAR* msg )
{
DWORD eNum;
TCHAR sysMsg[256];
TCHAR* p;
DWORD eNum;
TCHAR sysMsg[256];
TCHAR* p;
eNum = GetLastError( );
FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
eNum = GetLastError( );
FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, eNum,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
sysMsg, 256, NULL );
// Trim the end of the line and terminate it with a null
p = sysMsg;
while( ( *p > 31 ) || ( *p == 9 ) )
++p;
do { *p-- = 0; } while( ( p >= sysMsg ) &&
( ( *p == '.' ) || ( *p < 33 ) ) );
// Trim the end of the line and terminate it with a null
p = sysMsg;
while (*p > 31 || *p == 9 )
++p;
do {
*p-- = 0;
} while( p >= sysMsg && (*p == '.' || *p < 33));
// Display the message
_tprintf( TEXT("\n WARNING: %s failed with error %d (%s)"), msg, eNum, sysMsg );
@@ -331,7 +331,6 @@ void printError( TCHAR* msg )
#endif
void AttachExternalDialog::procSelected(const QModelIndex &index0)
{
QModelIndex index = index0.sibling(index0.row(), 0);

28
src/plugins/debugger/attachremotedialog.cpp
View File

@@ -150,10 +150,10 @@ void AttachRemoteDialog::rebuildProcessList()
#include <stdio.h>
// Forward declarations:
BOOL GetProcessList( );
BOOL ListProcessModules( DWORD dwPID );
BOOL ListProcessThreads( DWORD dwOwnerPID );
void printError( TCHAR* msg );
BOOL GetProcessList();
BOOL ListProcessModules(DWORD dwPID);
BOOL ListProcessThreads(DWORD dwOwnerPID);
void printError(TCHAR* msg);
BOOL GetProcessList( )
{
@@ -164,7 +164,7 @@ BOOL GetProcessList( )
// Take a snapshot of all processes in the system.
hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
if( hProcessSnap == INVALID_HANDLE_VALUE )
if (hProcessSnap == INVALID_HANDLE_VALUE)
{
printError( TEXT("CreateToolhelp32Snapshot (of processes)") );
return( FALSE );
@@ -175,7 +175,7 @@ BOOL GetProcessList( )
// Retrieve information about the first process,
// and exit if unsuccessful
if( !Process32First( hProcessSnap, &pe32 ) )
if (!Process32First( hProcessSnap, &pe32 ))
{
printError( TEXT("Process32First") ); // show cause of failure
CloseHandle( hProcessSnap ); // clean the snapshot object
@@ -193,12 +193,12 @@ BOOL GetProcessList( )
// Retrieve the priority class.
dwPriorityClass = 0;
hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, pe32.th32ProcessID );
if( hProcess == NULL )
if (hProcess == NULL)
printError( TEXT("OpenProcess") );
else
{
dwPriorityClass = GetPriorityClass( hProcess );
if( !dwPriorityClass )
if (!dwPriorityClass)
printError( TEXT("GetPriorityClass") );
CloseHandle( hProcess );
}
@@ -207,7 +207,7 @@ BOOL GetProcessList( )
printf( "\n Thread count = %d", pe32.cntThreads );
printf( "\n Parent process ID = 0x%08X", pe32.th32ParentProcessID );
printf( "\n Priority base = %d", pe32.pcPriClassBase );
if( dwPriorityClass )
if (dwPriorityClass)
printf( "\n Priority class = %d", dwPriorityClass );
// List the modules and threads associated with this process
@@ -228,7 +228,7 @@ BOOL ListProcessModules( DWORD dwPID )
// Take a snapshot of all modules in the specified process.
hModuleSnap = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, dwPID );
if( hModuleSnap == INVALID_HANDLE_VALUE )
if (hModuleSnap == INVALID_HANDLE_VALUE)
{
printError( TEXT("CreateToolhelp32Snapshot (of modules)") );
return( FALSE );
@@ -239,7 +239,7 @@ BOOL ListProcessModules( DWORD dwPID )
// Retrieve information about the first module,
// and exit if unsuccessful
if( !Module32First( hModuleSnap, &me32 ) )
if (!Module32First( hModuleSnap, &me32 ))
{
printError( TEXT("Module32First") ); // show cause of failure
CloseHandle( hModuleSnap ); // clean the snapshot object
@@ -271,7 +271,7 @@ BOOL ListProcessThreads( DWORD dwOwnerPID )
// Take a snapshot of all running threads
hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
if( hThreadSnap == INVALID_HANDLE_VALUE )
if (hThreadSnap == INVALID_HANDLE_VALUE)
return( FALSE );
// Fill in the size of the structure before using it.
@@ -279,7 +279,7 @@ BOOL ListProcessThreads( DWORD dwOwnerPID )
// Retrieve information about the first thread,
// and exit if unsuccessful
if( !Thread32First( hThreadSnap, &te32 ) )
if (!Thread32First( hThreadSnap, &te32 ))
{
printError( TEXT("Thread32First") ); // show cause of failure
CloseHandle( hThreadSnap ); // clean the snapshot object
@@ -291,7 +291,7 @@ BOOL ListProcessThreads( DWORD dwOwnerPID )
// associated with the specified process
do
{
if( te32.th32OwnerProcessID == dwOwnerPID )
if (te32.th32OwnerProcessID == dwOwnerPID)
{
printf( "\n\n THREAD ID = 0x%08X", te32.th32ThreadID );
printf( "\n Base priority = %d", te32.tpBasePri );

6
src/plugins/debugger/breakhandler.cpp
View File

@@ -33,8 +33,8 @@
#include "breakhandler.h"
#include "assert.h"
#include "imports.h" // TextEditor::BaseTextMark
#include "qtcassert.h"
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
@@ -371,7 +371,7 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
static const QIcon icon2(":/gdbdebugger/images/breakpoint_pending.svg");
static const QString empty = QString(QLatin1Char('-'));
QWB_ASSERT(mi.isValid(), return QVariant());
QTC_ASSERT(mi.isValid(), return QVariant());
if (mi.row() >= size())
return QVariant();
@@ -550,7 +550,7 @@ void BreakHandler::breakByFunction(const QString &functionName)
// One per function is enough for now
for (int index = size(); --index >= 0;) {
const BreakpointData *data = at(index);
QWB_ASSERT(data, break);
QTC_ASSERT(data, break);
if (data->funcName == functionName && data->condition.isEmpty()
&& data->ignoreCount.isEmpty())
return;

5
src/plugins/debugger/debugger.pro
View File

@@ -10,11 +10,12 @@ include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/cpptools/cpptools.pri)
include(../../libs/cplusplus/cplusplus.pri)
INCLUDEPATH += ../../libs/utils
# DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
QT += gui network script
HEADERS += assert.h \
attachexternaldialog.h \
HEADERS += attachexternaldialog.h \
attachremotedialog.h \
breakhandler.h \
breakwindow.h \

44
src/plugins/debugger/debuggermanager.cpp
View File

@@ -62,6 +62,7 @@
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QTime>
#include <QtCore/QTimer>
#include <QtGui/QAction>
#include <QtGui/QComboBox>
@@ -145,6 +146,7 @@ void DebuggerManager::init()
m_modulesHandler = 0;
m_registerHandler = 0;
m_statusLabel = new QLabel;
m_breakWindow = new BreakWindow;
m_disassemblerWindow = new DisassemblerWindow;
m_modulesWindow = new ModulesWindow;
@@ -157,6 +159,7 @@ void DebuggerManager::init()
//m_tooltipWindow = new WatchWindow(WatchWindow::TooltipType);
//m_watchersWindow = new QTreeView;
m_tooltipWindow = new QTreeView;
m_statusTimer = new QTimer(this);
m_mainWindow = new QMainWindow;
m_mainWindow->setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::North);
@@ -349,6 +352,15 @@ void DebuggerManager::init()
m_useFastStartAction->setCheckable(true);
m_useFastStartAction->setChecked(true);
m_useToolTipsAction = new QAction(this);
m_useToolTipsAction->setText(tr("Use Tooltips While Debugging"));
m_useToolTipsAction->setToolTip(tr("Checking this will make enable "
"tooltips for variable values during debugging. Since this can slow "
"down debugging and does not provide reliable information as it does "
"not use scope information, it is switched off by default."));
m_useToolTipsAction->setCheckable(true);
m_useToolTipsAction->setChecked(false);
// FIXME
m_useFastStartAction->setChecked(false);
m_useFastStartAction->setEnabled(false);
@@ -408,6 +420,8 @@ void DebuggerManager::init()
this, SLOT(saveSessionData()));
connect(m_dumpLogAction, SIGNAL(triggered()),
this, SLOT(dumpLog()));
connect(m_statusTimer, SIGNAL(timeout()),
this, SLOT(clearStatusMessage()));
connect(m_outputWindow, SIGNAL(commandExecutionRequested(QString)),
this, SLOT(executeDebuggerCommand(QString)));
@@ -553,24 +567,24 @@ QAbstractItemModel *DebuggerManager::threadsModel()
return qobject_cast<ThreadsWindow*>(m_threadsWindow)->model();
}
void DebuggerManager::clearStatusMessage()
{
m_statusLabel->setText(m_lastPermanentStatusMessage);
}
void DebuggerManager::showStatusMessage(const QString &msg, int timeout)
{
Q_UNUSED(timeout)
//qDebug() << "STATUS: " << msg;
showDebuggerOutput("status:", msg);
mainWindow()->statusBar()->showMessage(msg, timeout);
#if 0
QString currentTime = QTime::currentTime().toString("hh:mm:ss.zzz");
ICore *core = m_pm->getObject<Core::ICore>();
//qDebug() << qPrintable(currentTime) << "Setting status: " << msg;
if (msg.isEmpty())
core->messageManager()->displayStatusBarMessage(msg);
else if (timeout == -1)
core->messageManager()->displayStatusBarMessage(tr("Debugger: ") + msg);
else
core->messageManager()->displayStatusBarMessage(tr("Debugger: ") + msg, timeout);
#endif
m_statusLabel->setText(" " + msg);
if (timeout > 0) {
m_statusTimer->setSingleShot(true);
m_statusTimer->start(timeout);
} else {
m_lastPermanentStatusMessage = msg;
m_statusTimer->stop();
}
}
void DebuggerManager::notifyStartupFinished()
@@ -938,6 +952,8 @@ void DebuggerManager::loadSessionData()
QVariant value;
querySessionValue(QLatin1String("UseFastStart"), &value);
m_useFastStartAction->setChecked(value.toBool());
querySessionValue(QLatin1String("UseToolTips"), &value);
m_useToolTipsAction->setChecked(value.toBool());
querySessionValue(QLatin1String("UseCustomDumpers"), &value);
m_useCustomDumpersAction->setChecked(!value.isValid() || value.toBool());
querySessionValue(QLatin1String("SkipKnownFrames"), &value);
@@ -951,6 +967,8 @@ void DebuggerManager::saveSessionData()
setSessionValue(QLatin1String("UseFastStart"),
m_useFastStartAction->isChecked());
setSessionValue(QLatin1String("UseToolTips"),
m_useToolTipsAction->isChecked());
setSessionValue(QLatin1String("UseCustomDumpers"),
m_useCustomDumpersAction->isChecked());
setSessionValue(QLatin1String("SkipKnownFrames"),

16
src/plugins/debugger/debuggermanager.h
View File

@@ -44,9 +44,11 @@ QT_BEGIN_NAMESPACE
class QAction;
class QAbstractItemModel;
class QDockWidget;
class QLabel;
class QMainWindow;
class QModelIndex;
class QSplitter;
class QTimer;
class QWidget;
QT_END_NAMESPACE
@@ -190,7 +192,8 @@ public:
private:
friend class DebugMode;
virtual QWidget *threadsWindow() = 0;
virtual QWidget *threadsWindow() const = 0;
virtual QLabel *statusLabel() const = 0;
virtual QList<QDockWidget*> dockWidgets() const = 0;
virtual void createDockWidgets() = 0;
};
@@ -213,6 +216,7 @@ public:
IDebuggerManagerAccessForEngines *engineInterface();
IDebuggerManagerAccessForDebugMode *debugModeInterface();
QMainWindow *mainWindow() const { return m_mainWindow; }
QLabel *statusLabel() const { return m_statusLabel; }
enum StartMode { startInternal, startExternal, attachExternal };
enum DebuggerType { GdbDebugger, ScriptDebugger, WinDebugger };
@@ -272,7 +276,7 @@ public slots:
void assignValueInDebugger(const QString &expr, const QString &value);
void executeDebuggerCommand(const QString &command);
void showStatusMessage(const QString &msg, int timeout); // -1 forever
void showStatusMessage(const QString &msg, int timeout = -1); // -1 forever
private slots:
void showDebuggerOutput(const QString &prefix, const QString &msg);
@@ -290,6 +294,7 @@ private slots:
void reloadRegisters();
void registerDockToggled(bool on);
void setStatus(int status);
void clearStatusMessage();
private:
//
@@ -303,6 +308,7 @@ private:
ThreadsHandler *threadsHandler() { return m_threadsHandler; }
WatchHandler *watchHandler() { return m_watchHandler; }
QAction *useCustomDumpersAction() const { return m_useCustomDumpersAction; }
QAction *useToolTipsAction() const { return m_useToolTipsAction; }
QAction *debugDumpersAction() const { return m_debugDumpersAction; }
bool skipKnownFrames() const;
bool debugDumpers() const;
@@ -322,7 +328,7 @@ private:
//
// Implementation of IDebuggerManagerAccessForDebugMode
//
QWidget *threadsWindow() { return m_threadsWindow; }
QWidget *threadsWindow() const { return m_threadsWindow; }
QList<QDockWidget*> dockWidgets() const { return m_dockWidgets; }
void createDockWidgets();
@@ -382,6 +388,7 @@ private:
/// Views
QMainWindow *m_mainWindow;
QLabel *m_statusLabel;
QDockWidget *m_breakDock;
QDockWidget *m_disassemblerDock;
QDockWidget *m_modulesDock;
@@ -425,6 +432,7 @@ private:
QAction *m_debugDumpersAction;
QAction *m_useCustomDumpersAction;
QAction *m_useFastStartAction;
QAction *m_useToolTipsAction;
QAction *m_dumpLogAction;
QWidget *m_breakWindow;
@@ -440,6 +448,8 @@ private:
int m_status;
bool m_busy;
QTimer *m_statusTimer;
QString m_lastPermanentStatusMessage;
IDebuggerEngine *engine();
IDebuggerEngine *m_engine;

24
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -33,13 +33,13 @@
#include "debuggerplugin.h"
#include "assert.h"
#include "debuggerconstants.h"
#include "debuggermanager.h"
#include "debuggerrunner.h"
#include "gdboptionpage.h"
#include "gdbengine.h"
#include "mode.h"
#include "qtcassert.h"
#include <coreplugin/actionmanager/actionmanagerinterface.h>
#include <coreplugin/coreconstants.h>
@@ -91,6 +91,7 @@ const char * const DEBUG_DUMPERS = "Debugger.DebugDumpers";
const char * const ADD_TO_WATCH = "Debugger.AddToWatch";
const char * const USE_CUSTOM_DUMPERS = "Debugger.UseCustomDumpers";
const char * const USE_FAST_START = "Debugger.UseFastStart";
const char * const USE_TOOL_TIPS = "Debugger.UseToolTips";
const char * const SKIP_KNOWN_FRAMES = "Debugger.SkipKnownFrames";
const char * const DUMP_LOG = "Debugger.DumpLog";
@@ -188,7 +189,7 @@ void DebuggerPlugin::shutdown()
{
if (m_debugMode)
m_debugMode->shutdown(); // saves state including manager information
QWB_ASSERT(m_manager, /**/);
QTC_ASSERT(m_manager, /**/);
if (m_manager)
m_manager->shutdown();
@@ -225,13 +226,13 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes
m_pm = ExtensionSystem::PluginManager::instance();
ICore *core = m_pm->getObject<Core::ICore>();
QWB_ASSERT(core, return false);
QTC_ASSERT(core, return false);
Core::ActionManagerInterface *actionManager = core->actionManager();
QWB_ASSERT(actionManager, return false);
QTC_ASSERT(actionManager, return false);
Core::UniqueIDManager *uidm = core->uniqueIDManager();
QWB_ASSERT(uidm, return false);
QTC_ASSERT(uidm, return false);
QList<int> globalcontext;
globalcontext << Core::Constants::C_GLOBAL_ID;
@@ -374,13 +375,17 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *error_mes
Constants::USE_FAST_START, globalcontext);
mdebug->addAction(cmd);
cmd = actionManager->registerAction(m_manager->m_useToolTipsAction,
Constants::USE_TOOL_TIPS, globalcontext);
mdebug->addAction(cmd);
#ifdef QT_DEBUG
cmd = actionManager->registerAction(m_manager->m_dumpLogAction,
Constants::DUMP_LOG, globalcontext);
//cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+D,Ctrl+L")));
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+F11")));
mdebug->addAction(cmd);
#ifdef QT_DEBUG
cmd = actionManager->registerAction(m_manager->m_debugDumpersAction,
Constants::DEBUG_DUMPERS, debuggercontext);
mdebug->addAction(cmd);
@@ -549,6 +554,9 @@ void DebuggerPlugin::requestMark(TextEditor::ITextEditor *editor, int lineNumber
void DebuggerPlugin::showToolTip(TextEditor::ITextEditor *editor,
const QPoint &point, int pos)
{
if (!m_manager->useToolTipsAction()->isChecked())
return;
QPlainTextEdit *plaintext = qobject_cast<QPlainTextEdit*>(editor->widget());
if (!plaintext)
return;
@@ -590,13 +598,13 @@ void DebuggerPlugin::querySessionValue(const QString &name, QVariant *value)
void DebuggerPlugin::setConfigValue(const QString &name, const QVariant &value)
{
QWB_ASSERT(m_debugMode, return);
QTC_ASSERT(m_debugMode, return);
m_debugMode->settings()->setValue(name, value);
}
void DebuggerPlugin::queryConfigValue(const QString &name, QVariant *value)
{
QWB_ASSERT(m_debugMode, return);
QTC_ASSERT(m_debugMode, return);
*value = m_debugMode->settings()->value(name);
}

6
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -33,8 +33,8 @@
#include "debuggerrunner.h"
#include "assert.h"
#include "debuggermanager.h"
#include "qtcassert.h"
#include <projectexplorer/applicationrunconfiguration.h>
#include <projectexplorer/environment.h>
@@ -118,9 +118,9 @@ void DebuggerRunControl::start()
m_running = true;
ApplicationRunConfigurationPtr rc =
qSharedPointerCast<ApplicationRunConfiguration>(runConfiguration());
QWB_ASSERT(rc, return);
QTC_ASSERT(rc, return);
ProjectExplorer::Project *project = rc->project();
QWB_ASSERT(project, return);
QTC_ASSERT(project, return);
m_manager->m_executable = rc->executable();
m_manager->m_environment = rc->environment().toStringList();

129
src/plugins/debugger/gdbengine.cpp
View File

@@ -33,11 +33,11 @@
#include "gdbengine.h"
#include "assert.h"
#include "debuggerconstants.h"
#include "debuggermanager.h"
#include "gdbmi.h"
#include "procinterrupt.h"
#include "qtcassert.h"
#include "disassemblerhandler.h"
#include "breakhandler.h"
@@ -278,25 +278,8 @@ void GdbEngine::init()
connect(&m_gdbProc, SIGNAL(finished(int, QProcess::ExitStatus)), q,
SLOT(exitDebugger()));
// Custom dumpers
//m_dumperServerConnection = 0;
//m_dumperServer = new DumperServer(this);
//QString name = "gdb-" +
// QDateTime::currentDateTime().toString("yyyy_MM_dd-hh_mm_ss_zzz");
//m_dumperServer->listen(name);
//connect(m_dumperServer, SIGNAL(newConnection()),
// this, SLOT(acceptConnection()));
//if (!m_dumperServer->isListening()) {
// QMessageBox::critical(q->mainWindow(), tr("Dumper Server Setup Failed"),
// tr("Unable to create server listening for data: %1.\n"
// "Server name: %2").arg(m_dumperServer->errorString(), name),
// QMessageBox::Retry | QMessageBox::Cancel);
// }
connect(qq->debugDumpersAction(), SIGNAL(toggled(bool)),
this, SLOT(setDebugDumpers(bool)));
connect(qq->useCustomDumpersAction(), SIGNAL(toggled(bool)),
this, SLOT(setCustomDumpersWanted(bool)));
@@ -347,7 +330,7 @@ void GdbEngine::gdbProcError(QProcess::ProcessError error)
"This is the default return value of error().");
}
q->showStatusMessage(msg, 5000);
q->showStatusMessage(msg);
QMessageBox::critical(q->mainWindow(), tr("Error"), msg);
// act as if it was closed by the core
q->exitDebugger();
@@ -451,7 +434,7 @@ void GdbEngine::handleResponse()
while (from != to && *from != '\n')
s += *from++;
//qDebug() << "UNREQUESTED DATA " << s << " TAKEN AS APPLICATION OUTPUT";
s += '\n';
//s += '\n';
m_inbuffer = QByteArray(from, to - from);
emit applicationOutputAvailable("app-stdout: ", s);
@@ -470,7 +453,7 @@ void GdbEngine::handleResponse()
for (; from != to; ++from) {
const char c = *from;
if (!isNameChar(c))
break;
break;
asyncClass += *from;
}
//qDebug() << "ASYNCCLASS" << asyncClass;
@@ -647,7 +630,7 @@ void GdbEngine::readGdbStandardOutput()
#endif
m_inbuffer.append(out);
//QWB_ASSERT(!m_inbuffer.isEmpty(), return);
//QTC_ASSERT(!m_inbuffer.isEmpty(), return);
char c = m_inbuffer[m_inbuffer.size() - 1];
static const QByteArray termArray("(gdb) ");
@@ -710,7 +693,7 @@ void GdbEngine::sendCommand(const QString &command, int type,
bool temporarilyStopped = false;
if (needStop && q->status() == DebuggerInferiorRunning) {
q->showStatusMessage(tr("Temporarily stopped"), -1);
q->showStatusMessage(tr("Temporarily stopped"));
interruptInferior();
temporarilyStopped = true;
}
@@ -1055,7 +1038,7 @@ void GdbEngine::handleExecJumpToLine(const GdbResultRecord &record)
// ~"242\t x *= 2;"
//109^done"
qq->notifyInferiorStopped();
q->showStatusMessage(tr("Jumped. Stopped."), -1);
q->showStatusMessage(tr("Jumped. Stopped."));
QString output = record.data.findChild("logstreamoutput").data();
if (!output.isEmpty())
return;
@@ -1074,7 +1057,7 @@ void GdbEngine::handleExecRunToFunction(const GdbResultRecord &record)
// func="foo",args=[{name="str",value="@0x7fff0f450460"}],
// file="main.cpp",fullname="/tmp/g/main.cpp",line="37"}
qq->notifyInferiorStopped();
q->showStatusMessage(tr("Run to Function finished. Stopped."), -1);
q->showStatusMessage(tr("Run to Function finished. Stopped."));
GdbMi frame = record.data.findChild("frame");
QString file = frame.findChild("fullname").data();
int line = frame.findChild("line").data().toInt();
@@ -1212,7 +1195,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
}
} else {
// slow start requested.
q->showStatusMessage("Loading " + data.toString(), -1);
q->showStatusMessage(tr("Loading %1...").arg(QString(data.toString())));
continueInferior();
}
return;
@@ -1231,7 +1214,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
msg = "Program exited after receiving signal "
+ data.findChild("signal-name").toString();
}
q->showStatusMessage(msg, -1);
q->showStatusMessage(msg);
q->exitDebugger();
return;
}
@@ -1271,7 +1254,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
if (isStoppedReason(reason) || reason.isEmpty()) {
// Need another round trip
if (reason == "breakpoint-hit") {
q->showStatusMessage(tr("Stopped at breakpoint."), -1);
q->showStatusMessage(tr("Stopped at breakpoint"));
GdbMi frame = data.findChild("frame");
//qDebug() << frame.toString();
m_currentFrame = frame.findChild("addr").data() + '%' +
@@ -1283,7 +1266,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
QVariant var = QVariant::fromValue<GdbMi>(data);
sendCommand("p 0", GdbAsyncOutput2, var); // dummy
} else {
q->showStatusMessage(tr("Stopped. %1").arg(reason), -1);
q->showStatusMessage(tr("Stopped: \"%1\"").arg(reason));
handleAsyncOutput2(data);
}
return;
@@ -1305,7 +1288,7 @@ void GdbEngine::handleAsyncOutput(const GdbMi &data)
// system="0.00136",start="1218810678.805432",end="1218810678.812011"}
q->resetLocation();
qq->notifyInferiorStopped();
q->showStatusMessage(tr("Run to Function finished. Stopped."), -1);
q->showStatusMessage(tr("Run to Function finished. Stopped."));
GdbMi frame = data.findChild("frame");
QString file = frame.findChild("fullname").data();
int line = frame.findChild("line").data().toInt();
@@ -1378,8 +1361,9 @@ void GdbEngine::handleShowVersion(const GdbResultRecord &response)
if (response.resultClass == GdbResultDone) {
m_gdbVersion = 100;
QString msg = response.data.findChild("consolestreamoutput").data();
QRegExp supported("GNU gdb 6.[6789]");
if (msg.indexOf(supported) == -1) {
QRegExp supported("GNU gdb(.*) (\\d+)\\.(\\d+)\\.(\\d+)");
if (supported.indexIn(msg) == -1) {
qDebug() << "UNSUPPORTED GDB VERSION " << msg;
QStringList list = msg.split("\n");
while (list.size() > 2)
list.removeLast();
@@ -1396,11 +1380,11 @@ void GdbEngine::handleShowVersion(const GdbResultRecord &response)
#else
//QMessageBox::information(m_mainWindow, tr("Warning"), msg);
#endif
}
int pos = msg.indexOf("GNU gdb 6.");
if (pos != -1) {
m_gdbVersion = 600 + (msg.at(pos + 10).unicode() - '0') * 10;
//qDebug() << "GDB VERSION " << m_gdbVersion << msg;
} else {
m_gdbVersion = 10000 * supported.cap(2).toInt()
+ 100 * supported.cap(3).toInt()
+ 1 * supported.cap(4).toInt();
//qDebug() << "GDB VERSION " << m_gdbVersion;
}
}
}
@@ -1414,7 +1398,7 @@ void GdbEngine::handleFileExecAndSymbols
QString msg = response.data.findChild("msg").data();
QMessageBox::critical(q->mainWindow(), tr("Error"),
tr("Starting executable failed:\n") + msg);
QWB_ASSERT(q->status() == DebuggerInferiorRunning, /**/);
QTC_ASSERT(q->status() == DebuggerInferiorRunning, /**/);
interruptInferior();
}
}
@@ -1423,19 +1407,19 @@ void GdbEngine::handleExecRun(const GdbResultRecord &response)
{
if (response.resultClass == GdbResultRunning) {
qq->notifyInferiorRunning();
q->showStatusMessage(tr("Running..."), -1);
q->showStatusMessage(tr("Running..."));
//reloadModules();
} else if (response.resultClass == GdbResultError) {
QString msg = response.data.findChild("msg").data();
if (msg == "Cannot find bounds of current function") {
qq->notifyInferiorStopped();
//q->showStatusMessage(tr("No debug information available. "
// "Leaving function..."), -1);
// "Leaving function..."));
//stepOutExec();
} else {
QMessageBox::critical(q->mainWindow(), tr("Error"),
tr("Starting executable failed:\n") + msg);
QWB_ASSERT(q->status() == DebuggerInferiorRunning, /**/);
QTC_ASSERT(q->status() == DebuggerInferiorRunning, /**/);
interruptInferior();
}
}
@@ -1558,7 +1542,7 @@ bool GdbEngine::startDebugger()
qDebug() << "ExeFile: " << q->m_executable;
#endif
q->showStatusMessage("Starting Debugger", -1);
q->showStatusMessage(tr("Starting Debugger"));
emit gdbInputAvailable(QString(), theGdbSettings().m_gdbCmd + ' ' + gdbArgs.join(" "));
m_gdbProc.start(theGdbSettings().m_gdbCmd, gdbArgs);
@@ -1567,7 +1551,7 @@ bool GdbEngine::startDebugger()
if (m_gdbProc.state() != QProcess::Running)
return false;
q->showStatusMessage(tr("Gdb Running"), -1);
q->showStatusMessage(tr("Gdb Running"));
sendCommand("show version", GdbShowVersion);
if (qq->useFastStart()) {
@@ -2337,8 +2321,8 @@ void GdbEngine::handleModulesList(const GdbResultRecord &record)
void GdbEngine::handleStackSelectThread(const GdbResultRecord &record, int)
{
Q_UNUSED(record);
qDebug("FIXME: StackHandler::handleOutput: SelectThread");
q->showStatusMessage(tr("Retrieving data for stack view..."), -1);
//qDebug("FIXME: StackHandler::handleOutput: SelectThread");
q->showStatusMessage(tr("Retrieving data for stack view..."), 3000);
sendCommand("-stack-list-frames", StackListFrames);
}
@@ -2430,9 +2414,9 @@ void GdbEngine::selectThread(int index)
threadsHandler->setCurrentThread(index);
QList<ThreadData> threads = threadsHandler->threads();
QWB_ASSERT(index < threads.size(), return);
QTC_ASSERT(index < threads.size(), return);
int id = threads.at(index).id;
q->showStatusMessage(tr("Retrieving data for stack view..."), -1);
q->showStatusMessage(tr("Retrieving data for stack view..."), 10000);
sendCommand(QLatin1String("-thread-select ") + QString::number(id),
StackSelectThread);
}
@@ -2447,7 +2431,7 @@ void GdbEngine::activateFrame(int frameIndex)
//qDebug() << "ACTIVATE FRAME: " << frameIndex << oldIndex
// << stackHandler->currentIndex();
QWB_ASSERT(frameIndex < stackHandler->stackSize(), return);
QTC_ASSERT(frameIndex < stackHandler->stackSize(), return);
if (oldIndex != frameIndex) {
// Assuming this always succeeds saves a roundtrip.
@@ -2545,7 +2529,7 @@ bool GdbEngine::supportsThreads() const
{
// 6.3 crashes happily on -thread-list-ids. So don't use it.
// The test below is a semi-random pick, 6.8 works fine
return m_gdbVersion > 650;
return m_gdbVersion > 60500;
}
//////////////////////////////////////////////////////////////////////
@@ -2968,7 +2952,7 @@ bool GdbEngine::isCustomValueDumperAvailable(const QString &type) const
void GdbEngine::runCustomDumper(const WatchData & data0, bool dumpChildren)
{
WatchData data = data0;
QWB_ASSERT(!data.exp.isEmpty(), return);
QTC_ASSERT(!data.exp.isEmpty(), return);
QString tmplate;
QString inner;
bool isTemplate = extractTemplate(data.type, &tmplate, &inner);
@@ -3081,7 +3065,7 @@ void GdbEngine::runCustomDumper(const WatchData & data0, bool dumpChildren)
q->showStatusMessage(
tr("Retrieving data for watch view (%1 requests pending)...")
.arg(m_pendingRequests + 1), -1);
.arg(m_pendingRequests + 1), 10000);
// create response slot for socket data
QVariant var;
var.setValue(data);
@@ -3109,7 +3093,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
#if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: " << data.toString();
#endif
QWB_ASSERT(data.isValid(), return);
QTC_ASSERT(data.isValid(), return);
// in any case we need the type first
if (data.isTypeNeeded()) {
@@ -3137,7 +3121,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
}
// we should have a type now. this is relied upon further below
QWB_ASSERT(!data.type.isEmpty(), return);
QTC_ASSERT(!data.type.isEmpty(), return);
// a common case that can be easily solved
if (data.isChildrenNeeded() && isPointerType(data.type)
@@ -3195,7 +3179,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
}
if (data.isValueNeeded()) {
QWB_ASSERT(!data.variable.isEmpty(), return); // tested above
QTC_ASSERT(!data.variable.isEmpty(), return); // tested above
#if DEBUG_SUBITEM
qDebug() << "UPDATE SUBITEM: VALUE";
#endif
@@ -3224,7 +3208,7 @@ void GdbEngine::updateSubItem(const WatchData &data0)
}
if (data.isChildrenNeeded()) {
QWB_ASSERT(!data.variable.isEmpty(), return); // tested above
QTC_ASSERT(!data.variable.isEmpty(), return); // tested above
QString cmd = "-var-list-children --all-values \"" + data.variable + "\"";
sendSynchronizedCommand(cmd, WatchVarListChildren, QVariant::fromValue(data));
return;
@@ -3249,14 +3233,14 @@ void GdbEngine::updateSubItem(const WatchData &data0)
}
if (data.isChildCountNeeded()) {
QWB_ASSERT(!data.variable.isEmpty(), return); // tested above
QTC_ASSERT(!data.variable.isEmpty(), return); // tested above
QString cmd = "-var-list-children --all-values \"" + data.variable + "\"";
sendCommand(cmd, WatchVarListChildren, QVariant::fromValue(data));
return;
}
qDebug() << "FIXME: UPDATE SUBITEM: " << data.toString();
QWB_ASSERT(false, return);
QTC_ASSERT(false, return);
}
void GdbEngine::updateWatchModel()
@@ -3270,7 +3254,7 @@ void GdbEngine::updateWatchModel2()
{
PENDING_DEBUG("UPDATE WATCH MODEL");
QList<WatchData> incomplete = qq->watchHandler()->takeCurrentIncompletes();
//QWB_ASSERT(incomplete.isEmpty(), /**/);
//QTC_ASSERT(incomplete.isEmpty(), /**/);
if (!incomplete.isEmpty()) {
#if DEBUG_PENDING
qDebug() << "##############################################";
@@ -3299,7 +3283,7 @@ void GdbEngine::updateWatchModel2()
PENDING_DEBUG("REBUILDING MODEL")
emit gdbInputAvailable(QString(),
"[" + currentTime() + "] <Rebuild Watchmodel>");
q->showStatusMessage(tr("Finished retrieving data."), -1);
q->showStatusMessage(tr("Finished retrieving data."), 400);
qq->watchHandler()->rebuildModel();
if (!m_toolTipExpression.isEmpty()) {
@@ -3313,9 +3297,6 @@ void GdbEngine::updateWatchModel2()
"Cannot evaluate expression: " + m_toolTipExpression);
}
}
//qDebug() << "INSERT DATA" << data0.toString();
//q->showStatusMessage(tr("Stopped."), 5000);
}
void GdbEngine::handleQueryDataDumper1(const GdbResultRecord &record)
@@ -3438,7 +3419,7 @@ void GdbEngine::handleEvaluateExpression(const GdbResultRecord &record,
const WatchData &data0)
{
WatchData data = data0;
QWB_ASSERT(data.isValid(), qDebug() << "HUH?");
QTC_ASSERT(data.isValid(), qDebug() << "HUH?");
if (record.resultClass == GdbResultDone) {
//if (col == 0)
// data.name = record.data.findChild("value").data();
@@ -3466,7 +3447,7 @@ void GdbEngine::handleDumpCustomValue1(const GdbResultRecord &record,
const WatchData &data0)
{
WatchData data = data0;
QWB_ASSERT(data.isValid(), return);
QTC_ASSERT(data.isValid(), return);
if (record.resultClass == GdbResultDone) {
// ignore this case, data will follow
} else if (record.resultClass == GdbResultError) {
@@ -3500,7 +3481,7 @@ void GdbEngine::handleDumpCustomValue2(const GdbResultRecord &record,
const WatchData &data0)
{
WatchData data = data0;
QWB_ASSERT(data.isValid(), return);
QTC_ASSERT(data.isValid(), return);
//qDebug() << "CUSTOM VALUE RESULT: " << record.toString();
//qDebug() << "FOR DATA: " << data.toString() << record.resultClass;
if (record.resultClass == GdbResultDone) {
@@ -3661,10 +3642,20 @@ void GdbEngine::setLocals(const QList<GdbMi> &locals)
QHash<QString, int> seen;
foreach (const GdbMi &item, locals) {
// Local variables of inlined code are reported as
// 26^done,locals={varobj={exp="this",value="",name="var4",exp="this",
// numchild="1",type="const QtSharedPointer::Basic<CPlusPlus::..."
// We do not want these at all. Current hypotheses is that those
// "spurious" locals have _two_ "exp" field. Try to filter them:
#ifdef Q_OS_MAC
QString name = item.findChild("exp").data();
int numExps = 0;
foreach (const GdbMi &child, item.children())
numExps += int(child.name() == "exp");
if (numExps > 1)
continue;
QString name = item.findChild("exp").data();
#else
QString name = item.findChild("name").data();
QString name = item.findChild("name").data();
#endif
int n = seen.value(name);
if (n) {
@@ -3897,7 +3888,7 @@ void GdbEngine::handleToolTip(const GdbResultRecord &record,
if (isCustomValueDumperAvailable(m_toolTip.type))
runCustomDumper(m_toolTip, false);
else
q->showStatusMessage(tr("Retrieving data for tooltip..."), -1);
q->showStatusMessage(tr("Retrieving data for tooltip..."), 10000);
sendCommand("-data-evaluate-expression " + m_toolTip.exp,
WatchToolTip, "evaluate");
//sendToolTipCommand("-var-evaluate-expression tooltip")
@@ -3972,7 +3963,7 @@ void GdbEngine::tryLoadCustomDumpers()
if (qq->useFastStart())
sendCommand("set stop-on-solib-events 0");
QString flag = QString::number(RTLD_NOW);
sendCommand("call dlopen(\"" + lib + "\", " + flag + ")");
sendCommand("call (void)dlopen(\"" + lib + "\", " + flag + ")");
sendCommand("sharedlibrary " + dotEscape(lib));
if (qq->useFastStart())
sendCommand("set stop-on-solib-events 1");

6
src/plugins/debugger/gdbengine.h
View File

@@ -34,6 +34,9 @@
#ifndef DEBUGGER_GDBENGINE_H
#define DEBUGGER_GDBENGINE_H
#include "idebuggerengine.h"
#include "gdbmi.h"
#include <QtCore/QByteArray>
#include <QtCore/QHash>
#include <QtCore/QMap>
@@ -48,9 +51,6 @@ class QAbstractItemModel;
class QWidget;
QT_END_NAMESPACE
#include "idebuggerengine.h"
#include "gdbmi.h"
namespace Debugger {
namespace Internal {

6
src/plugins/debugger/gdbmi.cpp
View File

@@ -32,7 +32,7 @@
***************************************************************************/
#include "gdbmi.h"
#include "assert.h"
#include "qtcassert.h"
#include <QtCore/QByteArray>
#include <QtCore/QDebug>
@@ -138,7 +138,7 @@ void GdbMi::parseValue(const Char *&from, const Char *to)
void GdbMi::parseTuple(const Char *&from, const Char *to)
{
//qDebug() << "parseTuple: " << QByteArray::fromUtf16(from, to - from);
QWB_ASSERT(*from == '{', /**/);
QTC_ASSERT(*from == '{', /**/);
++from;
parseTuple_helper(from, to);
}
@@ -166,7 +166,7 @@ void GdbMi::parseTuple_helper(const Char *&from, const Char *to)
void GdbMi::parseList(const Char *&from, const Char *to)
{
//qDebug() << "parseList: " << QByteArray::fromUtf16(from, to - from);
QWB_ASSERT(*from == '[', /**/);
QTC_ASSERT(*from == '[', /**/);
++from;
m_type = List;
while (from < to) {

6
src/plugins/debugger/gdbtypemacros.cpp
View File

@@ -59,10 +59,10 @@ TypeMacroPage::TypeMacroPage(GdbSettings *settings)
//insert qt4 defaults
m_settings->m_scriptFile = coreIFace->resourcePath() +
QLatin1String("/gdb/qt4macros");
for (int i=0; i<3; ++i) {
for (int i = 0; i < 3; ++i) {
QByteArray data;
QDataStream stream(&data, QIODevice::WriteOnly);
switch(i) {
switch (i) {
case 0:
stream << QString("printqstring") << (int)1;
m_settings->m_typeMacros.insert(QLatin1String("QString"), data);
@@ -154,7 +154,7 @@ void TypeMacroPage::finished(bool accepted)
m_settings->m_typeMacros.clear();
m_settings->m_scriptFile = m_ui.scriptEdit->text();
for (int i=0; i<m_ui.treeWidget->topLevelItemCount(); ++i) {
for (int i = 0; i < m_ui.treeWidget->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = m_ui.treeWidget->topLevelItem(i);
QByteArray data;
QDataStream stream(&data, QIODevice::WriteOnly);

5
src/plugins/debugger/idebuggerengine.h
View File

@@ -36,6 +36,11 @@
#include <QtCore/QObject>
QT_BEGIN_NAMESPACE
class QPoint;
class QString;
QT_END_NAMESPACE
namespace Debugger {
namespace Internal {

8
src/plugins/debugger/mode.cpp
View File

@@ -33,9 +33,9 @@
#include "mode.h"
#include "assert.h"
#include "debuggerconstants.h"
#include "debuggermanager.h"
#include "qtcassert.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
@@ -169,6 +169,8 @@ QToolBar *DebugMode::createToolBar()
managerAccess->threadsWindow(), SIGNAL(threadSelected(int)));
debugToolBar->addWidget(threadBox);
debugToolBar->addWidget(managerAccess->statusLabel());
QWidget *stretch = new QWidget;
stretch->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
debugToolBar->addWidget(stretch);
@@ -211,8 +213,8 @@ void DebugMode::focusCurrentEditor(IMode *mode)
void DebugMode::writeSettings() const
{
QSettings *s = settings();
QWB_ASSERT(m_manager, return);
QWB_ASSERT(m_manager->mainWindow(), return);
QTC_ASSERT(m_manager, return);
QTC_ASSERT(m_manager->mainWindow(), return);
s->beginGroup(QLatin1String("DebugMode"));
s->setValue(QLatin1String("State"), m_manager->mainWindow()->saveState());
s->setValue(QLatin1String("Locked"), m_toggleLockedAction->isChecked());

6
src/plugins/debugger/scriptengine.cpp
View File

@@ -33,7 +33,7 @@
#include "scriptengine.h"
#include "assert.h"
#include "qtcassert.h"
#include "debuggerconstants.h"
#include "debuggermanager.h"
@@ -574,7 +574,7 @@ void ScriptEngine::updateSubItem(const WatchData &data0)
{
WatchData data = data0;
//qDebug() << "\nUPDATE SUBITEM: " << data.toString();
QWB_ASSERT(data.isValid(), return);
QTC_ASSERT(data.isValid(), return);
if (data.isTypeNeeded() || data.isValueNeeded()) {
QScriptValue ob = data.scriptValue;
@@ -667,7 +667,7 @@ void ScriptEngine::updateSubItem(const WatchData &data0)
return;
}
QWB_ASSERT(false, return);
QTC_ASSERT(false, return);
}
IDebuggerEngine *createScriptEngine(DebuggerManager *parent)

6
src/plugins/debugger/stackhandler.cpp
View File

@@ -33,7 +33,7 @@
#include "stackhandler.h"
#include "assert.h"
#include "qtcassert.h"
#include <QtCore/QAbstractTableModel>
#include <QtCore/QDebug>
@@ -128,8 +128,8 @@ Qt::ItemFlags StackHandler::flags(const QModelIndex &index) const
StackFrame StackHandler::currentFrame() const
{
QWB_ASSERT(m_currentIndex >= 0, return StackFrame());
QWB_ASSERT(m_currentIndex < m_stackFrames.size(), return StackFrame());
QTC_ASSERT(m_currentIndex >= 0, return StackFrame());
QTC_ASSERT(m_currentIndex < m_stackFrames.size(), return StackFrame());
return m_stackFrames.at(m_currentIndex);
}

2
src/plugins/debugger/startexternaldialog.cpp
View File

@@ -88,7 +88,7 @@ QString StartExternalDialog::executableArguments() const
result << QLatin1String("--args");
result << execEdit->text();
for(int i=0; i<args.length(); ++i) {
for (int i = 0; i < args.length(); ++i) {
current = args.at(i);
if (current == QLatin1Char('\"') && last != QLatin1Char('\\')) {

48
src/plugins/debugger/watchhandler.cpp
View File

@@ -37,7 +37,7 @@
#include "modeltest.h"
#endif
#include "assert.h"
#include "qtcassert.h"
#include <QtCore/QDebug>
#include <QtCore/QEvent>
@@ -426,7 +426,7 @@ QVariant WatchHandler::data(const QModelIndex &idx, int role) const
int node = idx.internalId();
if (node < 0)
return QVariant();
QWB_ASSERT(node < m_displaySet.size(), return QVariant());
QTC_ASSERT(node < m_displaySet.size(), return QVariant());
const WatchData &data = m_displaySet.at(node);
@@ -702,10 +702,10 @@ void WatchHandler::rebuildModel()
// Possibly append dummy items to prevent empty views
bool ok = true;
QWB_ASSERT(m_displaySet.size() >= 2, ok = false);
QWB_ASSERT(m_displaySet.at(1).iname == "local", ok = false);
QWB_ASSERT(m_displaySet.at(2).iname == "tooltip", ok = false);
QWB_ASSERT(m_displaySet.at(3).iname == "watch", ok = false);
QTC_ASSERT(m_displaySet.size() >= 2, ok = false);
QTC_ASSERT(m_displaySet.at(1).iname == "local", ok = false);
QTC_ASSERT(m_displaySet.at(2).iname == "tooltip", ok = false);
QTC_ASSERT(m_displaySet.at(3).iname == "watch", ok = false);
if (ok) {
for (int i = 1; i <= 3; ++i) {
WatchData &data = m_displaySet[i];
@@ -777,7 +777,7 @@ void WatchHandler::collapseChildren(const QModelIndex &idx)
qDebug() << "WATCHHANDLER: COLLAPSE IGNORED" << idx;
return;
}
QWB_ASSERT(checkIndex(idx.internalId()), return);
QTC_ASSERT(checkIndex(idx.internalId()), return);
#if 0
QString iname0 = m_displaySet.at(idx.internalId()).iname;
MODEL_DEBUG("COLLAPSE NODE" << iname0);
@@ -806,11 +806,11 @@ void WatchHandler::expandChildren(const QModelIndex &idx)
int index = idx.internalId();
if (index == 0)
return;
QWB_ASSERT(index >= 0, qDebug() << toString() << index; return);
QWB_ASSERT(index < m_completeSet.size(), qDebug() << toString() << index; return);
QTC_ASSERT(index >= 0, qDebug() << toString() << index; return);
QTC_ASSERT(index < m_completeSet.size(), qDebug() << toString() << index; return);
const WatchData &display = m_displaySet.at(index);
QWB_ASSERT(index >= 0, qDebug() << toString() << index; return);
QWB_ASSERT(index < m_completeSet.size(), qDebug() << toString() << index; return);
QTC_ASSERT(index >= 0, qDebug() << toString() << index; return);
QTC_ASSERT(index < m_completeSet.size(), qDebug() << toString() << index; return);
const WatchData &complete = m_completeSet.at(index);
MODEL_DEBUG("\n\nEXPAND" << display.iname);
if (display.iname.isEmpty()) {
@@ -848,7 +848,7 @@ void WatchHandler::expandChildren(const QModelIndex &idx)
void WatchHandler::insertData(const WatchData &data)
{
//MODEL_DEBUG("INSERTDATA: " << data.toString());
QWB_ASSERT(data.isValid(), return);
QTC_ASSERT(data.isValid(), return);
if (data.isSomethingNeeded())
insertDataHelper(m_incompleteSet, data);
else
@@ -977,7 +977,7 @@ bool WatchHandler::canFetchMore(const QModelIndex &parent) const
// needs to be made synchronous to be useful. Busy loop is no good.
if (!parent.isValid())
return false;
QWB_ASSERT(checkIndex(parent.internalId()), return false);
QTC_ASSERT(checkIndex(parent.internalId()), return false);
const WatchData &data = m_displaySet.at(parent.internalId());
MODEL_DEBUG("CAN FETCH MORE: " << parent << " children: " << data.childCount
<< data.iname);
@@ -990,7 +990,7 @@ void WatchHandler::fetchMore(const QModelIndex &parent)
MODEL_DEBUG("FETCH MORE: " << parent);
return;
QWB_ASSERT(checkIndex(parent.internalId()), return);
QTC_ASSERT(checkIndex(parent.internalId()), return);
QString iname = m_displaySet.at(parent.internalId()).iname;
if (m_inFetchMore) {
@@ -1049,15 +1049,15 @@ QModelIndex WatchHandler::index(int row, int col, const QModelIndex &parent) con
MODEL_DEBUG(" -> " << QModelIndex() << " (2) ");
return QModelIndex();
}
QWB_ASSERT(checkIndex(parentIndex), return QModelIndex());
QTC_ASSERT(checkIndex(parentIndex), return QModelIndex());
const WatchData &data = m_displaySet.at(parentIndex);
QWB_ASSERT(row >= 0, qDebug() << "ROW: " << row << "PARENT: " << parent
QTC_ASSERT(row >= 0, qDebug() << "ROW: " << row << "PARENT: " << parent
<< data.toString() << toString(); return QModelIndex());
QWB_ASSERT(row < data.childIndex.size(),
QTC_ASSERT(row < data.childIndex.size(),
MODEL_DEBUG("ROW: " << row << data.toString() << toString());
return QModelIndex());
QModelIndex idx = createIndex(row, col, data.childIndex.at(row));
QWB_ASSERT(idx.row() == m_displaySet.at(idx.internalId()).row,
QTC_ASSERT(idx.row() == m_displaySet.at(idx.internalId()).row,
return QModelIndex());
MODEL_DEBUG(" -> " << idx << " (A) ");
return idx;
@@ -1071,15 +1071,15 @@ QModelIndex WatchHandler::parent(const QModelIndex &idx) const
}
MODEL_DEBUG("PARENT " << idx);
int currentIndex = idx.internalId();
QWB_ASSERT(checkIndex(currentIndex), return QModelIndex());
QWB_ASSERT(idx.row() == m_displaySet.at(currentIndex).row,
QTC_ASSERT(checkIndex(currentIndex), return QModelIndex());
QTC_ASSERT(idx.row() == m_displaySet.at(currentIndex).row,
MODEL_DEBUG("IDX: " << idx << toString(); return QModelIndex()));
int parentIndex = m_displaySet.at(currentIndex).parentIndex;
if (parentIndex < 0) {
MODEL_DEBUG(" -> " << QModelIndex() << " (2) ");
return QModelIndex();
}
QWB_ASSERT(checkIndex(parentIndex), return QModelIndex());
QTC_ASSERT(checkIndex(parentIndex), return QModelIndex());
QModelIndex parent =
createIndex(m_displaySet.at(parentIndex).row, 0, parentIndex);
MODEL_DEBUG(" -> " << parent);
@@ -1094,7 +1094,7 @@ int WatchHandler::rowCount(const QModelIndex &idx) const
return 0;
}
int thisIndex = idx.internalId();
QWB_ASSERT(checkIndex(thisIndex), return 0);
QTC_ASSERT(checkIndex(thisIndex), return 0);
if (idx.row() == -1 && idx.column() == -1) {
MODEL_DEBUG(" -> " << 3 << " (B) ");
return 1;
@@ -1129,7 +1129,7 @@ int WatchHandler::columnCount(const QModelIndex &idx) const
return 0;
}
MODEL_DEBUG(" -> " << 3 << " (B) ");
QWB_ASSERT(checkIndex(idx.internalId()), return 3);
QTC_ASSERT(checkIndex(idx.internalId()), return 3);
return 3;
}
@@ -1139,7 +1139,7 @@ bool WatchHandler::hasChildren(const QModelIndex &idx) const
bool base = rowCount(idx) > 0 && columnCount(idx) > 0;
MODEL_DEBUG("HAS CHILDREN: " << idx << base);
return base;
QWB_ASSERT(checkIndex(idx.internalId()), return false);
QTC_ASSERT(checkIndex(idx.internalId()), return false);
const WatchData &data = m_displaySet.at(idx.internalId());
MODEL_DEBUG("HAS CHILDREN: " << idx << data.toString());
return data.childCount > 0; // || data.childIndex.size() > 0;

2
src/plugins/designer/cpp/formclasswizardparameters.cpp
View File

@@ -156,7 +156,7 @@ bool FormClassWizardParameters::generateCpp(QString *header, QString *source, in
if (languageChange) {
sourceStr << '\n' << namespaceIndent << "void " << unqualifiedClassName << "::" << "changeEvent(QEvent *e)\n"
<< namespaceIndent << "{\n"
<< namespaceIndent << indent << "switch(e->type()) {\n" << namespaceIndent << indent << "case QEvent::LanguageChange:\n"
<< namespaceIndent << indent << "switch (e->type()) {\n" << namespaceIndent << indent << "case QEvent::LanguageChange:\n"
<< namespaceIndent << indent << indent;
if (embedding != InheritedUiClass)
sourceStr << uiMemberC << (embedding == PointerAggregatedUiClass ? "->" : ".");

2
src/plugins/designer/formeditorw.cpp
View File

@@ -472,7 +472,7 @@ Core::IActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManagerI
const QString deviceProfilePrefix = QLatin1String("DeviceProfile");
const QChar dot = QLatin1Char('.');
foreach(QAction* a, actions) {
foreach (QAction* a, actions) {
QString name = menuId;
name += dot;
const QVariant data = a->data();

2
src/plugins/find/basetextfind.cpp
View File

@@ -101,7 +101,7 @@ QString BaseTextFind::currentFindString() const
cursor.movePosition(QTextCursor::StartOfWord);
cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
QString s = cursor.selectedText();
foreach(QChar c, s) {
foreach (QChar c, s) {
if (!c.isLetterOrNumber() && c != QLatin1Char('_')) {
s.clear();
break;

2
src/plugins/git/gitplugin.cpp
View File

@@ -161,7 +161,7 @@ GitPlugin::~GitPlugin()
}
if (!m_editorFactories.empty()) {
foreach(Core::IEditorFactory* pf, m_editorFactories)
foreach (Core::IEditorFactory* pf, m_editorFactories)
removeObject(pf);
qDeleteAll(m_editorFactories);
}

13
src/plugins/help/contentstoolwindow.cpp
View File

@@ -126,7 +126,7 @@ void ContentsToolWindow::contentsDone()
{
m_widget->setCursor(QCursor(Qt::WaitCursor));
QList<QPair<QString, ContentList> > contentList = helpEngine->contents();
for(QList<QPair<QString, ContentList> >::Iterator it = contentList.begin(); it != contentList.end(); ++it) {
for (QList<QPair<QString, ContentList> >::Iterator it = contentList.begin(); it != contentList.end(); ++it) {
QTreeWidgetItem *newEntry;
QTreeWidgetItem *contentEntry;
QStack<QTreeWidgetItem*> stack;
@@ -135,7 +135,7 @@ void ContentsToolWindow::contentsDone()
bool root = false;
QTreeWidgetItem *lastItem[64];
for(int j = 0; j < 64; ++j)
for (int j = 0; j < 64; ++j)
lastItem[j] = 0;
ContentList lst = (*it).second;
@@ -149,19 +149,18 @@ void ContentsToolWindow::contentsDone()
stack.push(newEntry);
depth = 1;
root = true;
}
else{
if((item.depth > depth) && root) {
} else {
if (item.depth > depth && root) {
depth = item.depth;
stack.push(contentEntry);
}
if(item.depth == depth) {
if (item.depth == depth) {
contentEntry = new QTreeWidgetItem(stack.top(), lastItem[ depth ]);
lastItem[ depth ] = contentEntry;
contentEntry->setText(0, item.title);
contentEntry->setData(0, LinkRole, item.reference);
}
else if(item.depth < depth) {
else if (item.depth < depth) {
stack.pop();
depth--;
item = *(--it);

20
src/plugins/help/helpengine.cpp
View File

@@ -296,7 +296,7 @@ quint32 HelpEngine::getFileAges()
QStringList::const_iterator i = addDocuFiles.begin();
quint32 fileAges = 0;
for(; i != addDocuFiles.end(); ++i) {
for (; i != addDocuFiles.end(); ++i) {
QFileInfo fi(*i);
if (fi.exists())
fileAges += fi.lastModified().toTime_t();
@@ -364,7 +364,7 @@ void TitleMapThread::run()
bool needRebuild = false;
if (Config::configuration()->profileName() == QLatin1String("default")) {
const QStringList docuFiles = Config::configuration()->docFiles();
for(QStringList::ConstIterator it = docuFiles.begin(); it != docuFiles.end(); it++) {
for (QStringList::ConstIterator it = docuFiles.begin(); it != docuFiles.end(); it++) {
if (!QFile::exists(*it)) {
Config::configuration()->saveProfile(Profile::createDefaultProfile());
Config::configuration()->loadDefaultProfile();
@@ -383,7 +383,7 @@ void TitleMapThread::run()
getAllContents();
titleMap.clear();
for(QList<QPair<QString, ContentList> >::Iterator it = contentList.begin(); it != contentList.end(); ++it) {
for (QList<QPair<QString, ContentList> >::Iterator it = contentList.begin(); it != contentList.end(); ++it) {
ContentList lst = (*it).second;
foreach (ContentItem item, lst) {
titleMap[item.reference] = item.title.trimmed();
@@ -430,7 +430,7 @@ void TitleMapThread::buildContentDict()
QStringList docuFiles = Config::configuration()->docFiles();
quint32 fileAges = 0;
for(QStringList::iterator it = docuFiles.begin(); it != docuFiles.end(); it++) {
for (QStringList::iterator it = docuFiles.begin(); it != docuFiles.end(); it++) {
QFile file(*it);
if (!file.exists()) {
#ifdef _SHOW_ERRORS_
@@ -441,7 +441,7 @@ void TitleMapThread::buildContentDict()
}
fileAges += QFileInfo(file).lastModified().toTime_t();
DocuParser *handler = DocuParser::createParser(*it);
if(!handler) {
if (!handler) {
#ifdef _SHOW_ERRORS_
emit errorOccured(tr("Documentation file %1 is not compatible!\n"
"Skipping file.").arg(QFileInfo(file).absoluteFilePath()));
@@ -450,7 +450,7 @@ void TitleMapThread::buildContentDict()
}
bool ok = handler->parse(&file);
file.close();
if(ok) {
if (ok) {
contentList += qMakePair(*it, QList<ContentItem>(handler->getContentItems()));
delete handler;
} else {
@@ -469,7 +469,7 @@ void TitleMapThread::buildContentDict()
if (contentOut.open(QFile::WriteOnly)) {
QDataStream s(&contentOut);
s << fileAges;
for(QList<QPair<QString, ContentList> >::Iterator it = contentList.begin(); it != contentList.end(); ++it) {
for (QList<QPair<QString, ContentList> >::Iterator it = contentList.begin(); it != contentList.end(); ++it) {
s << *it;
}
contentOut.close();
@@ -542,12 +542,12 @@ void IndexThread::buildKeywordDB()
QStringList::iterator i = addDocuFiles.begin();
int steps = 0;
for(; i != addDocuFiles.end(); i++)
for (; i != addDocuFiles.end(); i++)
steps += QFileInfo(*i).size();
QList<IndexKeyword> lst;
quint32 fileAges = 0;
for(i = addDocuFiles.begin(); i != addDocuFiles.end(); i++){
for (i = addDocuFiles.begin(); i != addDocuFiles.end(); i++) {
QFile file(*i);
if (!file.exists()) {
#ifdef _SHOW_ERRORS_
@@ -560,7 +560,7 @@ void IndexThread::buildKeywordDB()
DocuParser *handler = DocuParser::createParser(*i);
bool ok = handler->parse(&file);
file.close();
if(!ok){
if (!ok){
#ifdef _SHOW_ERRORS_
QString msg = QString::fromLatin1("In file %1:\n%2")
.arg(QFileInfo(file).absoluteFilePath())

2
src/plugins/help/helpplugin.cpp
View File

@@ -512,7 +512,7 @@ void HelpPlugin::activateContext()
// case 1 sidebar shown and has focus, we show whatever we have in the
// sidebar in big
RightPanePlaceHolder* placeHolder = RightPanePlaceHolder::current();
if(placeHolder && Core::RightPaneWidget::instance()->hasFocus()) {
if (placeHolder && Core::RightPaneWidget::instance()->hasFocus()) {
switchToHelpMode();
return;
}

7
src/plugins/perforce/perforceplugin.cpp
View File

@@ -561,10 +561,9 @@ void PerforcePlugin::submit()
QStringList stdOutLines = result2.stdOut.split(QLatin1Char('\n'));
QStringList depotFileNames;
foreach(const QString &line, stdOutLines) {
if (line.startsWith("... depotFile")) {
foreach (const QString &line, stdOutLines) {
if (line.startsWith("... depotFile"))
depotFileNames.append(line.mid(14));
}
}
if (depotFileNames.isEmpty()) {
showOutput(tr("Project has no files"));
@@ -1225,7 +1224,7 @@ PerforcePlugin::~PerforcePlugin()
}
if (!m_editorFactories.empty()) {
foreach(Core::IEditorFactory* pf, m_editorFactories)
foreach (Core::IEditorFactory *pf, m_editorFactories)
removeObject(pf);
qDeleteAll(m_editorFactories);
m_editorFactories.clear();

19
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -112,7 +112,7 @@ bool AbstractProcessStep::init(const QString &name)
void AbstractProcessStep::run(QFutureInterface<bool> & fi)
{
m_futureInterface = &fi;
if(!m_enabled) {
if (!m_enabled) {
fi.reportResult(true);
return;
}
@@ -136,7 +136,7 @@ void AbstractProcessStep::run(QFutureInterface<bool> & fi)
Qt::DirectConnection);
m_process->start(m_command, m_arguments);
if(!m_process->waitForStarted()) {
if (!m_process->waitForStarted()) {
processStartupFailed();
delete m_process;
m_process = 0;
@@ -188,8 +188,7 @@ void AbstractProcessStep::processStartupFailed()
void AbstractProcessStep::processReadyReadStdOutput()
{
m_process->setReadChannel(QProcess::StandardOutput);
while(m_process->canReadLine())
{
while (m_process->canReadLine()) {
QString line = QString::fromLocal8Bit(m_process->readLine()).trimmed();
stdOut(line);
}
@@ -203,8 +202,7 @@ void AbstractProcessStep::stdOut(const QString &line)
void AbstractProcessStep::processReadyReadStdError()
{
m_process->setReadChannel(QProcess::StandardError);
while (m_process->canReadLine())
{
while (m_process->canReadLine()) {
QString line = QString::fromLocal8Bit(m_process->readLine()).trimmed();
stdError(line);
}
@@ -217,7 +215,7 @@ void AbstractProcessStep::stdError(const QString &line)
void AbstractProcessStep::checkForCancel()
{
if(m_futureInterface->isCanceled() && m_timer->isActive()) {
if (m_futureInterface->isCanceled() && m_timer->isActive()) {
m_timer->stop();
m_process->terminate();
m_process->waitForFinished(5000);
@@ -228,13 +226,12 @@ void AbstractProcessStep::checkForCancel()
void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)
{
QString line = QString::fromLocal8Bit(m_process->readAllStandardError()).trimmed();
if (!line.isEmpty()) {
if (!line.isEmpty())
stdOut(line);
}
line = QString::fromLocal8Bit(m_process->readAllStandardOutput()).trimmed();
if (!line.isEmpty()) {
if (!line.isEmpty())
stdError(line);
}
m_eventLoop->exit(0);
}

9
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -42,9 +42,8 @@ BuildConfiguration::BuildConfiguration(const QString &name)
}
BuildConfiguration::BuildConfiguration(const QString &name, BuildConfiguration *source)
:m_values(source->m_values), m_name(name)
: m_values(source->m_values), m_name(name)
{
}
QString BuildConfiguration::name() const
@@ -71,7 +70,7 @@ void BuildConfiguration::setDisplayName(const QString &name)
QVariant BuildConfiguration::getValue(const QString & key) const
{
QHash<QString, QVariant>::const_iterator it = m_values.find(key);
if(it != m_values.constEnd())
if (it != m_values.constEnd())
return *it;
else
return QVariant();
@@ -86,7 +85,7 @@ void BuildConfiguration::setValuesFromMap(QMap<QString, QVariant> map)
{
QMap<QString, QVariant>::const_iterator it, end;
end = map.constEnd();
for(it = map.constBegin(); it != end; ++it)
for (it = map.constBegin(); it != end; ++it)
setValue(it.key(), it.value());
}
@@ -95,7 +94,7 @@ QMap<QString, QVariant> BuildConfiguration::toMap() const
QMap<QString, QVariant> result;
QHash<QString, QVariant>::const_iterator it, end;
end = m_values.constEnd();
for(it = m_values.constBegin(); it != end; ++it)
for (it = m_values.constBegin(); it != end; ++it)
result.insert(it.key(), it.value());
return result;
}

24
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -142,7 +142,7 @@ BuildSettingsWidget::BuildSettingsWidget(Project *project)
void BuildSettingsWidget::buildConfigurationDisplayNameChanged(const QString &buildConfiguration)
{
QTreeWidgetItem *rootItem = m_ui.buildSettingsList->invisibleRootItem();
for(int i = 0; i < rootItem->childCount(); ++i) {
for (int i = 0; i < rootItem->childCount(); ++i) {
QTreeWidgetItem *child = rootItem->child(i);
if (child->data(0, Qt::UserRole).toString() == buildConfiguration) {
child->setText(0, m_project->displayNameFor(buildConfiguration));
@@ -334,7 +334,7 @@ void BuildSettingsWidget::createConfiguration()
{
bool ok;
QString newBuildConfiguration = QInputDialog::getText(this, tr("New configuration"), tr("New Configuration Name:"), QLineEdit::Normal, QString(), &ok);
if(!ok || newBuildConfiguration.isEmpty())
if (!ok || newBuildConfiguration.isEmpty())
return;
QString newDisplayName = newBuildConfiguration;
@@ -342,22 +342,20 @@ void BuildSettingsWidget::createConfiguration()
const QStringList &buildConfigurations = m_project->buildConfigurations();
if (buildConfigurations.contains(newBuildConfiguration)) {
int i = 2;
while(buildConfigurations.contains(newBuildConfiguration + QString::number(i))) {
while (buildConfigurations.contains(newBuildConfiguration + QString::number(i)))
++i;
}
newBuildConfiguration += QString::number(i);
}
// Check that we don't have a configuration with the same displayName
QStringList displayNames;
foreach(const QString &bc, buildConfigurations)
foreach (const QString &bc, buildConfigurations)
displayNames << m_project->displayNameFor(bc);
if (displayNames.contains(newDisplayName)) {
int i = 2;
while(displayNames.contains(newDisplayName + QString::number(i))) {
while (displayNames.contains(newDisplayName + QString::number(i)))
++i;
}
newDisplayName += QString::number(i);
}
@@ -407,11 +405,11 @@ void BuildSettingsWidget::setActiveConfiguration(const QString &configuration)
void BuildSettingsWidget::cloneConfiguration(const QString &sourceConfiguration)
{
if(sourceConfiguration.isEmpty())
if (sourceConfiguration.isEmpty())
return;
QString newBuildConfiguration = QInputDialog::getText(this, tr("Clone configuration"), tr("New Configuration Name:"));
if(newBuildConfiguration.isEmpty())
if (newBuildConfiguration.isEmpty())
return;
QString newDisplayName = newBuildConfiguration;
@@ -419,22 +417,20 @@ void BuildSettingsWidget::cloneConfiguration(const QString &sourceConfiguration)
const QStringList &buildConfigurations = m_project->buildConfigurations();
if (buildConfigurations.contains(newBuildConfiguration)) {
int i = 2;
while(buildConfigurations.contains(newBuildConfiguration + QString::number(i))) {
while (buildConfigurations.contains(newBuildConfiguration + QString::number(i)))
++i;
}
newBuildConfiguration += QString::number(i);
}
// Check that we don't have a configuration with the same displayName
QStringList displayNames;
foreach(const QString &bc, buildConfigurations)
foreach (const QString &bc, buildConfigurations)
displayNames << m_project->displayNameFor(bc);
if (displayNames.contains(newDisplayName)) {
int i = 2;
while(displayNames.contains(newDisplayName + QString::number(i))) {
while (displayNames.contains(newDisplayName + QString::number(i)))
++i;
}
newDisplayName += QString::number(i);
}

8
src/plugins/projectexplorer/buildstep.cpp
View File

@@ -60,8 +60,8 @@ void BuildStep::addBuildConfiguration(const QString &name)
void BuildStep::removeBuildConfiguration(const QString &name)
{
for(int i = 0; i != m_buildConfigurations.size(); ++i)
if(m_buildConfigurations.at(i)->name() == name) {
for (int i = 0; i != m_buildConfigurations.size(); ++i)
if (m_buildConfigurations.at(i)->name() == name) {
delete m_buildConfigurations.at(i);
m_buildConfigurations.removeAt(i);
break;
@@ -70,8 +70,8 @@ void BuildStep::removeBuildConfiguration(const QString &name)
void BuildStep::copyBuildConfiguration(const QString &source, const QString &dest)
{
for(int i = 0; i != m_buildConfigurations.size(); ++i)
if(m_buildConfigurations.at(i)->name() == source)
for (int i = 0; i != m_buildConfigurations.size(); ++i)
if (m_buildConfigurations.at(i)->name() == source)
m_buildConfigurations.push_back(new BuildConfiguration(dest, m_buildConfigurations.at(i)));
}

30
src/plugins/projectexplorer/buildstepspage.cpp
View File

@@ -119,17 +119,17 @@ void BuildStepsPage::init(const QString &buildConfiguration)
/* switch from one tree item / build step to another */
void BuildStepsPage::updateBuildStepWidget(QTreeWidgetItem *newItem, QTreeWidgetItem *oldItem)
{
if(oldItem == newItem)
if (oldItem == newItem)
return;
Q_ASSERT(m_pro);
if(newItem) {
if (newItem) {
int row = m_ui->buildSettingsList->indexOfTopLevelItem(newItem);
m_ui->buildSettingsWidget->setCurrentIndex(row);
BuildStepConfigWidget *widget = qobject_cast<BuildStepConfigWidget *>(m_ui->buildSettingsWidget->currentWidget());
Q_ASSERT(widget);
if (widget)
widget->init(m_configuration);
widget->init(m_configuration);
}
updateBuildStepButtonsState();
}
@@ -151,11 +151,11 @@ void BuildStepsPage::updateAddBuildStepMenu()
QMenu *menu = m_ui->buildStepAddButton->menu();
m_addBuildStepHash.clear();
menu->clear();
if(!map.isEmpty()) {
if (!map.isEmpty()) {
QStringList names;
QMap<QString, QPair<QString, IBuildStepFactory *> >::const_iterator it, end;
end = map.constEnd();
for(it = map.constBegin(); it != end; ++it) {
for (it = map.constBegin(); it != end; ++it) {
QAction *action = menu->addAction(it.key());
connect(action, SIGNAL(triggered()),
this, SLOT(addBuildStep()));
@@ -167,7 +167,7 @@ void BuildStepsPage::updateAddBuildStepMenu()
void BuildStepsPage::addBuildStep()
{
if(QAction *action = qobject_cast<QAction *>(sender())) {
if (QAction *action = qobject_cast<QAction *>(sender())) {
QPair<QString, IBuildStepFactory *> pair = m_addBuildStepHash.value(action);
BuildStep *newStep = pair.second->create(m_pro, pair.first);
m_pro->insertBuildStep(0, newStep);
@@ -182,7 +182,7 @@ void BuildStepsPage::addBuildStep()
void BuildStepsPage::removeBuildStep()
{
int pos = m_ui->buildSettingsList->currentIndex().row();
if(m_pro->buildSteps().at(pos)->immutable())
if (m_pro->buildSteps().at(pos)->immutable())
return;
bool blockSignals = m_ui->buildSettingsList->blockSignals(true);
delete m_ui->buildSettingsList->invisibleRootItem()->takeChild(pos);
@@ -190,7 +190,7 @@ void BuildStepsPage::removeBuildStep()
QWidget *widget = m_ui->buildSettingsWidget->widget(pos);
m_ui->buildSettingsWidget->removeWidget(widget);
delete widget;
if(pos < m_ui->buildSettingsList->invisibleRootItem()->childCount())
if (pos < m_ui->buildSettingsList->invisibleRootItem()->childCount())
m_ui->buildSettingsList->setCurrentItem(m_ui->buildSettingsList->invisibleRootItem()->child(pos));
else
m_ui->buildSettingsList->setCurrentItem(m_ui->buildSettingsList->invisibleRootItem()->child(pos - 1));
@@ -201,11 +201,11 @@ void BuildStepsPage::removeBuildStep()
void BuildStepsPage::upBuildStep()
{
int pos = m_ui->buildSettingsList->currentIndex().row();
if(pos < 1)
if (pos < 1)
return;
if(pos > m_ui->buildSettingsList->invisibleRootItem()->childCount()-1)
if (pos > m_ui->buildSettingsList->invisibleRootItem()->childCount()-1)
return;
if(m_pro->buildSteps().at(pos)->immutable() && m_pro->buildSteps().at(pos-1)->immutable())
if (m_pro->buildSteps().at(pos)->immutable() && m_pro->buildSteps().at(pos-1)->immutable())
return;
bool blockSignals = m_ui->buildSettingsList->blockSignals(true);
@@ -220,11 +220,11 @@ void BuildStepsPage::upBuildStep()
void BuildStepsPage::downBuildStep()
{
int pos = m_ui->buildSettingsList->currentIndex().row() + 1;
if(pos < 1)
if (pos < 1)
return;
if(pos > m_ui->buildSettingsList->invisibleRootItem()->childCount() - 1)
if (pos > m_ui->buildSettingsList->invisibleRootItem()->childCount() - 1)
return;
if(m_pro->buildSteps().at(pos)->immutable() && m_pro->buildSteps().at(pos - 1)->immutable())
if (m_pro->buildSteps().at(pos)->immutable() && m_pro->buildSteps().at(pos - 1)->immutable())
return;
bool blockSignals = m_ui->buildSettingsList->blockSignals(true);
@@ -238,7 +238,7 @@ void BuildStepsPage::downBuildStep()
void BuildStepsPage::changeEvent(QEvent *e)
{
switch(e->type()) {
switch (e->type()) {
case QEvent::LanguageChange:
m_ui->retranslateUi(this);
break;

31
src/plugins/projectexplorer/environment.cpp
View File

@@ -45,7 +45,7 @@ QList<EnvironmentItem> EnvironmentItem::fromStringList(QStringList list)
QList<EnvironmentItem> result;
foreach (const QString &string, list) {
int pos = string.indexOf(QLatin1Char('='));
if(pos == -1) {
if (pos == -1) {
EnvironmentItem item(string, "");
item.unset = true;
result.append(item);
@@ -61,7 +61,7 @@ QStringList EnvironmentItem::toStringList(QList<EnvironmentItem> list)
{
QStringList result;
foreach (const EnvironmentItem &item, list) {
if(item.unset)
if (item.unset)
result << QString(item.name);
else
result << QString(item.name + '=' + item.value);
@@ -71,14 +71,13 @@ QStringList EnvironmentItem::toStringList(QList<EnvironmentItem> list)
Environment::Environment()
{
}
Environment::Environment(QStringList env)
{
foreach(QString s, env) {
foreach (const QString &s, env) {
int i = s.indexOf("=");
if (i >=0 ) {
if (i >= 0) {
#ifdef Q_OS_WIN
m_values.insert(s.left(i).toUpper(), s.mid(i+1));
#else
@@ -196,13 +195,13 @@ QString Environment::searchInPath(QString executable)
executable.append(QLatin1String(".exe"));
#endif
const QChar slash = QLatin1Char('/');
foreach(const QString &p, path()) {
foreach (const QString &p, path()) {
// qDebug()<<"trying"<<path + '/' + executable;
QString fp = p;
fp += slash;
fp += executable;
const QFileInfo fi(fp);
if(fi.exists()) {
if (fi.exists()) {
// qDebug()<<"returning "<<fi.absoluteFilePath();
return fi.absoluteFilePath();
}
@@ -248,7 +247,7 @@ Environment::const_iterator Environment::constEnd() const
Environment::const_iterator Environment::find(const QString &name)
{
QMap<QString, QString>::const_iterator it = m_values.constFind(name);
if(it == m_values.constEnd())
if (it == m_values.constEnd())
return constEnd();
else
return it;
@@ -263,24 +262,24 @@ void Environment::modify(const QList<EnvironmentItem> & list)
{
Environment resultEnvironment = *this;
foreach (const EnvironmentItem &item, list) {
if(item.unset) {
if (item.unset) {
resultEnvironment.unset(item.name);
} else {
// TODO use variable expansion
QString value = item.value;
for(int i=0; i < value.size(); ++i) {
if(value.at(i) == QLatin1Char('$')) {
if((i + 1) < value.size()) {
for (int i=0; i < value.size(); ++i) {
if (value.at(i) == QLatin1Char('$')) {
if ((i + 1) < value.size()) {
const QChar &c = value.at(i+1);
int end = -1;
if (c == '(')
end = value.indexOf(')', i);
else if (c=='{')
else if (c == '{')
end = value.indexOf('}', i);
if(end != -1) {
if (end != -1) {
const QString &name = value.mid(i+2, end-i-2);
Environment::const_iterator it = find(name);
if(it != constEnd())
if (it != constEnd())
value.replace(i, end-i+1, it.value());
}
}
@@ -334,7 +333,7 @@ QStringList Environment::parseCombinedArgString(const QString &program)
QString Environment::joinArgumentList(const QStringList &arguments)
{
QString result;
foreach(QString arg, arguments) {
foreach (QString arg, arguments) {
if (!result.isEmpty())
result += QLatin1Char(' ');
arg.replace(QLatin1String("\""), QLatin1String("\"\"\""));

106
src/plugins/projectexplorer/environmenteditmodel.cpp
View File

@@ -38,11 +38,13 @@ using namespace ProjectExplorer;
EnvironmentModel::EnvironmentModel()
: m_mergedEnvironments(false)
{}
EnvironmentModel::~EnvironmentModel() {}
EnvironmentModel::~EnvironmentModel()
{}
QString EnvironmentModel::indexToVariable(const QModelIndex &index) const
{
if(m_mergedEnvironments)
if (m_mergedEnvironments)
return m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row());
else
return m_items.at(index.row()).name;
@@ -53,7 +55,7 @@ void EnvironmentModel::updateResultEnvironment()
m_resultEnvironment = m_baseEnvironment;
m_resultEnvironment.modify(m_items);
foreach (const EnvironmentItem &item, m_items) {
if(item.unset) {
if (item.unset) {
m_resultEnvironment.set(item.name, "<UNSET>");
}
}
@@ -68,10 +70,10 @@ void EnvironmentModel::setBaseEnvironment(const ProjectExplorer::Environment &en
void EnvironmentModel::setMergedEnvironments(bool b)
{
if(m_mergedEnvironments == b)
if (m_mergedEnvironments == b)
return;
m_mergedEnvironments = b;
if(b)
if (b)
updateResultEnvironment();
reset();
}
@@ -96,48 +98,46 @@ int EnvironmentModel::columnCount(const QModelIndex &parent) const
bool EnvironmentModel::changes(const QString &name) const
{
foreach(const EnvironmentItem& item, m_items) {
if(item.name == name) {
foreach (const EnvironmentItem& item, m_items)
if (item.name == name)
return true;
}
}
return false;
}
QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
{
if((role == Qt::DisplayRole || role == Qt::EditRole) && index.isValid()) {
if((m_mergedEnvironments && index.row() >= m_resultEnvironment.size()) ||
if ((role == Qt::DisplayRole || role == Qt::EditRole) && index.isValid()) {
if ((m_mergedEnvironments && index.row() >= m_resultEnvironment.size()) ||
(!m_mergedEnvironments && index.row() >= m_items.count())) {
return QVariant();
}
if(index.column() == 0) {
if(m_mergedEnvironments) {
if (index.column() == 0) {
if (m_mergedEnvironments) {
return m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row());
} else {
return m_items.at(index.row()).name;
}
} else if(index.column() == 1) {
if(m_mergedEnvironments) {
if(role == Qt::EditRole) {
} else if (index.column() == 1) {
if (m_mergedEnvironments) {
if (role == Qt::EditRole) {
int pos = findInChanges(indexToVariable(index));
if(pos != -1)
if (pos != -1)
return m_items.at(pos).value;
}
return m_resultEnvironment.value(m_resultEnvironment.constBegin() + index.row());
} else {
if(m_items.at(index.row()).unset)
if (m_items.at(index.row()).unset)
return "<UNSET>";
else
return m_items.at(index.row()).value;
}
}
}
if(role == Qt::FontRole) {
if(m_mergedEnvironments) {
if (role == Qt::FontRole) {
if (m_mergedEnvironments) {
// check wheter this environment variable exists in m_items
if(changes(m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row()))) {
if (changes(m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row()))) {
QFont f;
f.setBold(true);
return QVariant(f);
@@ -157,7 +157,7 @@ Qt::ItemFlags EnvironmentModel::flags(const QModelIndex &index) const
bool EnvironmentModel::hasChildren(const QModelIndex &index) const
{
if(!index.isValid())
if (!index.isValid())
return true;
else
return false;
@@ -165,14 +165,14 @@ bool EnvironmentModel::hasChildren(const QModelIndex &index) const
QVariant EnvironmentModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if(orientation == Qt::Vertical || role != Qt::DisplayRole)
if (orientation == Qt::Vertical || role != Qt::DisplayRole)
return QVariant();
return section == 0 ? tr("Variable") : tr("Value");
}
QModelIndex EnvironmentModel::index(int row, int column, const QModelIndex &parent) const
{
if(!parent.isValid())
if (!parent.isValid())
return createIndex(row, column, 0);
return QModelIndex();
}
@@ -188,16 +188,16 @@ QModelIndex EnvironmentModel::parent(const QModelIndex &index) const
/// *****************
int EnvironmentModel::findInChanges(const QString &name) const
{
for(int i=0; i<m_items.size(); ++i)
if(m_items.at(i).name == name)
for (int i=0; i<m_items.size(); ++i)
if (m_items.at(i).name == name)
return i;
return -1;
}
int EnvironmentModel::findInChangesInsertPosition(const QString &name) const
{
for(int i=0; i<m_items.size(); ++i)
if(m_items.at(i).name > name)
for (int i=0; i<m_items.size(); ++i)
if (m_items.at(i).name > name)
return i;
return m_items.size();
}
@@ -206,8 +206,8 @@ int EnvironmentModel::findInResult(const QString &name) const
{
Environment::const_iterator it;
int i = 0;
for(it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
if(m_resultEnvironment.key(it) == name)
for (it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
if (m_resultEnvironment.key(it) == name)
return i;
return -1;
}
@@ -216,28 +216,28 @@ int EnvironmentModel::findInResultInsertPosition(const QString &name) const
{
Environment::const_iterator it;
int i = 0;
for(it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
if(m_resultEnvironment.key(it) > name)
for (it = m_resultEnvironment.constBegin(); it != m_resultEnvironment.constEnd(); ++it, ++i)
if (m_resultEnvironment.key(it) > name)
return i;
return m_resultEnvironment.size();
}
bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if(role == Qt::EditRole && index.isValid()) {
if(index.column() == 0) {
if (role == Qt::EditRole && index.isValid()) {
if (index.column() == 0) {
//fail if a variable with the same name already exists
#ifdef Q_OS_WIN
if(findInChanges(value.toString().toUpper()) != -1)
if (findInChanges(value.toString().toUpper()) != -1)
return false;
#else
if(findInChanges(value.toString()) != -1)
if (findInChanges(value.toString()) != -1)
return false;
#endif
EnvironmentItem old("", "");
if(m_mergedEnvironments) {
if (m_mergedEnvironments) {
int pos = findInChanges(indexToVariable(index));
if(pos != -1) {
if (pos != -1) {
old = m_items.at(pos);
} else {
old.name = m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row());
@@ -252,16 +252,16 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
#else
const QString &newName = value.toString();
#endif
if(changes(old.name))
if (changes(old.name))
removeVariable(old.name);
old.name = newName;
addVariable(old);
return true;
} else if(index.column() == 1) {
if(m_mergedEnvironments) {
} else if (index.column() == 1) {
if (m_mergedEnvironments) {
const QString &name = indexToVariable(index);
int pos = findInChanges(name);
if(pos != -1) {
if (pos != -1) {
m_items[pos].value = value.toString();
m_items[pos].unset = false;
updateResultEnvironment();
@@ -287,13 +287,13 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
QModelIndex EnvironmentModel::addVariable()
{
const QString &name = "<VARIABLE>";
if(m_mergedEnvironments) {
if (m_mergedEnvironments) {
int i = findInResult(name);
if(i != -1)
if (i != -1)
return index(i, 0, QModelIndex());
} else {
int i = findInChanges(name);
if(i != -1)
if (i != -1)
return index(i, 0, QModelIndex());
}
// Don't exist, really add them
@@ -302,10 +302,10 @@ QModelIndex EnvironmentModel::addVariable()
QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
{
if(m_mergedEnvironments) {
if (m_mergedEnvironments) {
bool existsInBaseEnvironment = (m_baseEnvironment.find(item.name) != m_baseEnvironment.constEnd());
int rowInResult;
if(existsInBaseEnvironment)
if (existsInBaseEnvironment)
rowInResult = findInResult(item.name);
else
rowInResult = findInResultInsertPosition(item.name);
@@ -313,7 +313,7 @@ QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
qDebug()<<"addVariable "<<item.name<<existsInBaseEnvironment<<rowInResult<<rowInChanges;
if(existsInBaseEnvironment) {
if (existsInBaseEnvironment) {
m_items.insert(rowInChanges, item);
updateResultEnvironment();
emit dataChanged(index(rowInResult, 0, QModelIndex()), index(rowInResult, 1, QModelIndex()));
@@ -340,11 +340,11 @@ QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
void EnvironmentModel::removeVariable(const QString &name)
{
if(m_mergedEnvironments) {
if (m_mergedEnvironments) {
int rowInResult = findInResult(name);
int rowInChanges = findInChanges(name);
bool existsInBaseEnvironment = m_baseEnvironment.find(name) != m_baseEnvironment.constEnd();
if(existsInBaseEnvironment) {
if (existsInBaseEnvironment) {
m_items.removeAt(rowInChanges);
updateResultEnvironment();
emit dataChanged(index(rowInResult, 0, QModelIndex()), index(rowInResult, 1, QModelIndex()));
@@ -368,11 +368,11 @@ void EnvironmentModel::removeVariable(const QString &name)
void EnvironmentModel::unset(const QString &name)
{
if(m_mergedEnvironments) {
if (m_mergedEnvironments) {
int row = findInResult(name);
// look in m_items for the variable
int pos = findInChanges(name);
if(pos != -1) {
if (pos != -1) {
m_items[pos].unset = true;
updateResultEnvironment();
emit dataChanged(index(row, 0, QModelIndex()), index(row, 1, QModelIndex()));
@@ -398,7 +398,7 @@ void EnvironmentModel::unset(const QString &name)
bool EnvironmentModel::isUnset(const QString &name)
{
int pos = findInChanges(name);
if(pos != -1)
if (pos != -1)
return m_items.at(pos).unset;
else
return false;

4
src/plugins/projectexplorer/outputwindow.cpp
View File

@@ -64,7 +64,7 @@ bool OutputPane::canFocus()
void OutputPane::setFocus()
{
if(m_tabWidget->currentWidget())
if (m_tabWidget->currentWidget())
m_tabWidget->currentWidget()->setFocus();
}
@@ -199,7 +199,7 @@ void OutputPane::createNewOutputWindow(RunControl *rc)
// First look if we can reuse a tab
bool found = false;
for(int i=0; i<m_tabWidget->count(); ++i) {
for (int i=0; i<m_tabWidget->count(); ++i) {
RunControl *old = runControlForTab(i);
if (old->runConfiguration() == rc->runConfiguration() && !old->isRunning()) {
// Reuse this tab

2
src/plugins/projectexplorer/persistentsettings.cpp
View File

@@ -152,7 +152,7 @@ void PersistentSettingsWriter::writeValue(QDomElement &ps, const QVariant &varia
QDomElement values = ps.ownerDocument().createElement("valuelist");
values.setAttribute("type", QVariant::typeToName(QVariant::List));
QList<QVariant> varList = variant.toList();
foreach(QVariant var, varList) {
foreach (QVariant var, varList) {
writeValue(values, var);
}
ps.appendChild(values);

2
src/plugins/projectexplorer/pluginfilefactory.cpp
View File

@@ -90,7 +90,7 @@ QList<ProjectFileFactory*> ProjectFileFactory::createFactories(const Core::ICore
const QString filterSeparator = QLatin1String(";;");
filterString->clear();
foreach(IProjectManager *manager, projectManagers) {
foreach (IProjectManager *manager, projectManagers) {
rc.push_back(new ProjectFileFactory(core, manager));
if (!filterString->isEmpty())
*filterString += filterSeparator;

8
src/plugins/projectexplorer/processstep.cpp
View File

@@ -54,7 +54,7 @@ bool ProcessStep::init(const QString &buildConfiguration)
setEnvironment(buildConfiguration, project()->environment(buildConfiguration));
QVariant wd = value(buildConfiguration, "workingDirectory").toString();
QString workingDirectory;
if(!wd.isValid() || wd.toString().isEmpty())
if (!wd.isValid() || wd.toString().isEmpty())
workingDirectory = "$BUILDDIR";
else
workingDirectory = wd.toString();
@@ -161,7 +161,7 @@ QString ProcessStepConfigWidget::displayName() const
void ProcessStepConfigWidget::workingDirBrowseButtonClicked()
{
QString workingDirectory = QFileDialog::getExistingDirectory(this, "Select the working directory", m_ui.workingDirectoryLineEdit->text());
if(workingDirectory.isEmpty())
if (workingDirectory.isEmpty())
return;
m_ui.workingDirectoryLineEdit->setText(workingDirectory);
workingDirectoryLineEditTextEdited();
@@ -170,7 +170,7 @@ void ProcessStepConfigWidget::workingDirBrowseButtonClicked()
void ProcessStepConfigWidget::commandBrowseButtonClicked()
{
QString filename = QFileDialog::getOpenFileName(this, "Select the executable");
if(filename.isEmpty())
if (filename.isEmpty())
return;
m_ui.commandLineEdit->setText(filename);
commandLineEditTextEdited();
@@ -179,7 +179,7 @@ void ProcessStepConfigWidget::commandBrowseButtonClicked()
void ProcessStepConfigWidget::init(const QString &buildConfiguration)
{
m_buildConfiguration = buildConfiguration;
if(buildConfiguration != QString::null) {
if (buildConfiguration != QString::null) {
m_ui.commandLineEdit->setText(m_step->command(buildConfiguration));
QString workingDirectory = m_step->value(buildConfiguration, "workingDirectory").toString();

88
src/plugins/projectexplorer/project.cpp
View File

@@ -57,11 +57,9 @@ void Project::insertBuildStep(int position, BuildStep *step)
{
m_buildSteps.insert(position, step);
// check that the step has all the configurations
foreach(const QString & name, buildConfigurations())
{
foreach (const QString &name, buildConfigurations())
if (!step->getBuildConfiguration(name))
step->addBuildConfiguration(name);
}
}
void Project::removeBuildStep(int position)
@@ -80,11 +78,9 @@ void Project::insertCleanStep(int position, BuildStep *step)
{
m_cleanSteps.insert(position, step);
// check that the step has all the configurations
foreach(const QString & name, buildConfigurations())
{
foreach (const QString &name, buildConfigurations())
if (!step->getBuildConfiguration(name))
step->addBuildConfiguration(name);
}
}
void Project::removeCleanStep(int position)
@@ -100,10 +96,10 @@ void Project::addBuildConfiguration(const QString &name)
m_buildConfigurationValues.push_back(new BuildConfiguration(name));
for (int i = 0; i!=m_buildSteps.size(); ++i)
for (int i = 0; i != m_buildSteps.size(); ++i)
m_buildSteps.at(i)->addBuildConfiguration(name);
for (int i = 0; i!=m_cleanSteps.size(); ++i)
for (int i = 0; i != m_cleanSteps.size(); ++i)
m_cleanSteps.at(i)->addBuildConfiguration(name);
}
@@ -113,15 +109,15 @@ void Project::removeBuildConfiguration(const QString &name)
return;
for (int i = 0; i != m_buildConfigurationValues.size(); ++i)
if(m_buildConfigurationValues.at(i)->name() == name) {
if (m_buildConfigurationValues.at(i)->name() == name) {
delete m_buildConfigurationValues.at(i);
m_buildConfigurationValues.removeAt(i);
break;
}
for (int i = 0; i!=m_buildSteps.size(); ++i)
for (int i = 0; i != m_buildSteps.size(); ++i)
m_buildSteps.at(i)->removeBuildConfiguration(name);
for (int i = 0; i!=m_cleanSteps.size(); ++i)
for (int i = 0; i != m_cleanSteps.size(); ++i)
m_cleanSteps.at(i)->removeBuildConfiguration(name);
}
@@ -132,22 +128,21 @@ void Project::copyBuildConfiguration(const QString &source, const QString &dest)
return;
for (int i = 0; i != m_buildConfigurationValues.size(); ++i)
if(m_buildConfigurationValues.at(i)->name() == source)
if (m_buildConfigurationValues.at(i)->name() == source)
m_buildConfigurationValues.push_back(new BuildConfiguration(dest, m_buildConfigurationValues.at(i)));
for (int i = 0; i!= m_buildSteps.size(); ++i)
for (int i = 0; i != m_buildSteps.size(); ++i)
m_buildSteps.at(i)->copyBuildConfiguration(source, dest);
for (int i = 0; i!= m_cleanSteps.size(); ++i)
for (int i = 0; i != m_cleanSteps.size(); ++i)
m_cleanSteps.at(i)->copyBuildConfiguration(source, dest);
}
QStringList Project::buildConfigurations() const
{
QStringList result;
foreach (BuildConfiguration *bc, m_buildConfigurationValues) {
foreach (BuildConfiguration *bc, m_buildConfigurationValues)
result << bc->name();
}
return result;
}
@@ -195,39 +190,36 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
writer.saveValue("project", m_values);
//save buildsettings
foreach(const QString & buildConfigurationName, buildConfigurations()) {
foreach (const QString &buildConfigurationName, buildConfigurations()) {
QMap<QString, QVariant> temp =
getBuildConfiguration(buildConfigurationName)->toMap();
writer.saveValue("buildConfiguration-" + buildConfigurationName, temp);
}
QStringList buildStepNames;
foreach(BuildStep * buildStep, buildSteps()) {
foreach (BuildStep *buildStep, buildSteps())
buildStepNames << buildStep->name();
}
writer.saveValue("buildsteps", buildStepNames);
QStringList cleanStepNames;
foreach(BuildStep * cleanStep, cleanSteps()) {
foreach (BuildStep *cleanStep, cleanSteps())
cleanStepNames << cleanStep->name();
}
writer.saveValue("cleansteps", cleanStepNames);
QStringList buildConfigurationNames = buildConfigurations();
writer.saveValue("buildconfigurations", buildConfigurationNames );
//save buildstep configuration
int buildstepnr = 0;
foreach(BuildStep * buildStep, buildSteps())
{
foreach (BuildStep *buildStep, buildSteps()) {
QMap<QString, QVariant> buildConfiguration = buildStep->valuesToMap();
writer.saveValue("buildstep" + QString().setNum(buildstepnr), buildConfiguration);
++buildstepnr;
}
// save each buildstep/buildConfiguration combination
foreach(const QString & buildConfigurationName, buildConfigurationNames) {
foreach (const QString &buildConfigurationName, buildConfigurationNames) {
buildstepnr = 0;
foreach(BuildStep * buildStep, buildSteps()) {
foreach (BuildStep *buildStep, buildSteps()) {
QMap<QString, QVariant> temp =
buildStep->valuesToMap(buildConfigurationName);
writer.saveValue("buildconfiguration-" + buildConfigurationName + "-buildstep" + QString().setNum(buildstepnr), temp);
@@ -237,17 +229,16 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
//save cleansteps buildconfiguration
int cleanstepnr = 0;
foreach(BuildStep * cleanStep, cleanSteps())
{
foreach (BuildStep *cleanStep, cleanSteps()) {
QMap<QString, QVariant> buildConfiguration = cleanStep->valuesToMap();
writer.saveValue("cleanstep" + QString().setNum(cleanstepnr), buildConfiguration);
++cleanstepnr;
}
// save each cleanstep/buildConfiguration combination
foreach(const QString & buildConfigurationName, buildConfigurationNames) {
foreach (const QString &buildConfigurationName, buildConfigurationNames) {
cleanstepnr = 0;
foreach(BuildStep * cleanStep, cleanSteps()) {
foreach (BuildStep *cleanStep, cleanSteps()) {
QMap<QString, QVariant> temp = cleanStep->valuesToMap(buildConfigurationName);
writer.saveValue("buildconfiguration-" + buildConfigurationName + "-cleanstep" + QString().setNum(cleanstepnr), temp);
++cleanstepnr;
@@ -279,7 +270,7 @@ void Project::restoreSettingsImpl(PersistentSettingsReader &reader)
//Build Settings
const QStringList buildConfigurationNames = reader.restoreValue("buildconfigurations").toStringList();
foreach(const QString & buildConfigurationName, buildConfigurationNames) {
foreach (const QString &buildConfigurationName, buildConfigurationNames) {
addBuildConfiguration(buildConfigurationName);
QMap<QString, QVariant> temp =
reader.restoreValue("buildConfiguration-" + buildConfigurationName).toMap();
@@ -287,16 +278,16 @@ void Project::restoreSettingsImpl(PersistentSettingsReader &reader)
}
QVariant buildStepsVariant = reader.restoreValue("buildsteps");
if(buildStepsVariant.isValid()) {
if (buildStepsVariant.isValid()) {
// restoring BuildSteps from settings
int pos = 0;
const QList<IBuildStepFactory *> buildStepFactories =
ExtensionSystem::PluginManager::instance()->getObjects<IBuildStepFactory>();
QStringList buildStepNames = buildStepsVariant.toStringList();
foreach(const QString & buildStepName, buildStepNames) {
foreach(IBuildStepFactory * factory, buildStepFactories) {
if(factory->canCreate(buildStepName)) {
BuildStep * buildStep = factory->create(this, buildStepName);
foreach (const QString &buildStepName, buildStepNames) {
foreach (IBuildStepFactory *factory, buildStepFactories) {
if (factory->canCreate(buildStepName)) {
BuildStep *buildStep = factory->create(this, buildStepName);
insertBuildStep(pos, buildStep);
++pos;
break;
@@ -307,10 +298,10 @@ void Project::restoreSettingsImpl(PersistentSettingsReader &reader)
QStringList cleanStepNames = reader.restoreValue("cleansteps").toStringList();
// restoring BuildSteps from settings
pos = 0;
foreach(const QString & cleanStepName, cleanStepNames) {
foreach(IBuildStepFactory * factory, buildStepFactories) {
if(factory->canCreate(cleanStepName)) {
BuildStep * cleanStep = factory->create(this, cleanStepName);
foreach (const QString &cleanStepName, cleanStepNames) {
foreach (IBuildStepFactory *factory, buildStepFactories) {
if (factory->canCreate(cleanStepName)) {
BuildStep *cleanStep = factory->create(this, cleanStepName);
insertCleanStep(pos, cleanStep);
++pos;
break;
@@ -324,15 +315,15 @@ void Project::restoreSettingsImpl(PersistentSettingsReader &reader)
// restore BuildSteps configuration
int buildstepnr = 0;
foreach(BuildStep * buildStep, buildSteps()) {
foreach (BuildStep *buildStep, buildSteps()) {
QMap<QString, QVariant> buildConfiguration = reader.restoreValue("buildstep" + QString().setNum(buildstepnr)).toMap();
buildStep->setValuesFromMap(buildConfiguration);
++buildstepnr;
}
foreach(const QString & buildConfigurationName, buildConfigurationNames) {
foreach (const QString &buildConfigurationName, buildConfigurationNames) {
buildstepnr = 0;
foreach(BuildStep * buildStep, buildSteps()) {
foreach (BuildStep *buildStep, buildSteps()) {
//get the buildconfiguration for this build step
QMap<QString, QVariant> buildConfiguration =
reader.restoreValue("buildconfiguration-" + buildConfigurationName + "-buildstep" + QString().setNum(buildstepnr)).toMap();
@@ -343,16 +334,15 @@ void Project::restoreSettingsImpl(PersistentSettingsReader &reader)
// restore CleanSteps configuration
int cleanstepnr = 0;
foreach(BuildStep * cleanStep, cleanSteps())
{
foreach (BuildStep *cleanStep, cleanSteps()) {
QMap<QString, QVariant> buildConfiguration = reader.restoreValue("cleanstep" + QString().setNum(cleanstepnr)).toMap();
cleanStep->setValuesFromMap(buildConfiguration);
++cleanstepnr;
}
foreach(const QString & buildConfigurationName, buildConfigurationNames) {
foreach (const QString &buildConfigurationName, buildConfigurationNames) {
cleanstepnr = 0;
foreach(BuildStep * cleanStep, cleanSteps()) {
foreach (BuildStep *cleanStep, cleanSteps()) {
//get the buildconfiguration for this clean step
QMap<QString, QVariant> buildConfiguration =
reader.restoreValue("buildconfiguration-" + buildConfigurationName + "-cleanstep" + QString().setNum(cleanstepnr)).toMap();
@@ -373,7 +363,7 @@ void Project::restoreSettingsImpl(PersistentSettingsReader &reader)
if (!typeVariant.isValid())
break;
const QString &type = typeVariant.toString();
foreach (IRunConfigurationFactory * factory, factories) {
foreach (IRunConfigurationFactory *factory, factories) {
if (factory->canCreate(type)) {
QSharedPointer<RunConfiguration> rc = factory->create(this, type);
rc->restore(reader);
@@ -403,7 +393,7 @@ QVariant Project::value(const QString &name) const
{
QMap<QString, QVariant>::const_iterator it =
m_values.find(name);
if(it != m_values.constEnd())
if (it != m_values.constEnd())
return it.value();
else
return QVariant();
@@ -497,7 +487,7 @@ QString Project::displayNameFor(const QString &buildConfiguration)
void Project::setDisplayNameFor(const QString &buildConfiguration, const QString &displayName)
{
QStringList displayNames;
foreach(const QString &bc, buildConfigurations()) {
foreach (const QString &bc, buildConfigurations()) {
if (bc != buildConfiguration)
displayNames << displayNameFor(bc);
}

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

@@ -734,7 +734,7 @@ void ProjectExplorerPlugin::clearSession()
void ProjectExplorerPlugin::extensionsInitialized()
{
m_fileFactories = ProjectFileFactory::createFactories(m_core, &m_projectFilterString);
foreach(ProjectFileFactory *pf, m_fileFactories) {
foreach (ProjectFileFactory *pf, m_fileFactories) {
m_profileMimeTypes += pf->mimeTypes();
addAutoReleasedObject(pf);
}
@@ -1212,7 +1212,7 @@ QStringList ProjectExplorerPlugin::allFilesWithDependencies(Project *pro)
qDebug() << "ProjectExplorerPlugin::allFilesWithDependencies(" << pro->file()->fileName() << ")";
QStringList filesToSave;
foreach(Project *p, m_session->projectOrder(pro)) {
foreach (Project *p, m_session->projectOrder(pro)) {
FindAllFilesVisitor filesVisitor;
p->rootProjectNode()->accept(&filesVisitor);
filesToSave << filesVisitor.filePaths();
@@ -1783,7 +1783,7 @@ void ProjectExplorerPlugin::updateSessionMenu()
{
m_sessionMenu->clear();
const QString &activeSession = m_session->activeSession();
foreach(const QString &session, m_session->sessions()) {
foreach (const QString &session, m_session->sessions()) {
QAction *act = m_sessionMenu->addAction(session, this, SLOT(setSession()));
act->setCheckable(true);
if (session == activeSession)

28
src/plugins/projectexplorer/projectmodels.cpp
View File

@@ -988,10 +988,9 @@ void FlatModel::added(FolderNode* parentNode, const QList<Node*> &newNodeList)
return;
}
while(true)
{
while (true) {
// Skip all that are the same
while(*oldIter == *newIter) {
while (*oldIter == *newIter) {
++oldIter;
++newIter;
if (oldIter == oldNodeList.constEnd()) {
@@ -1002,7 +1001,7 @@ void FlatModel::added(FolderNode* parentNode, const QList<Node*> &newNodeList)
int count = newIter - startOfBlock;
if (count > 0) {
beginInsertRows(parentIndex, pos, pos+count-1);
while(startOfBlock != newIter) {
while (startOfBlock != newIter) {
oldNodeList.insert(pos, *startOfBlock);
++pos;
++startOfBlock;
@@ -1015,7 +1014,7 @@ void FlatModel::added(FolderNode* parentNode, const QList<Node*> &newNodeList)
}
QList<Node *>::const_iterator startOfBlock = newIter;
while(*oldIter != *newIter)
while (*oldIter != *newIter)
++newIter;
// startOfBlock is the first that was diffrent
// newIter points to the new position of oldIter
@@ -1024,7 +1023,7 @@ void FlatModel::added(FolderNode* parentNode, const QList<Node*> &newNodeList)
int pos = oldIter - oldNodeList.constBegin();
int count = newIter - startOfBlock;
beginInsertRows(parentIndex, pos, pos + count - 1);
while(startOfBlock != newIter) {
while (startOfBlock != newIter) {
oldNodeList.insert(pos, *startOfBlock);
++pos;
++startOfBlock;
@@ -1059,10 +1058,9 @@ void FlatModel::removed(FolderNode* parentNode, const QList<Node*> &newNodeList)
return;
}
while(true)
{
while (true) {
// Skip all that are the same
while(*oldIter == *newIter) {
while (*oldIter == *newIter) {
++oldIter;
++newIter;
if (newIter == newNodeList.constEnd()) {
@@ -1073,7 +1071,7 @@ void FlatModel::removed(FolderNode* parentNode, const QList<Node*> &newNodeList)
int count = oldIter - startOfBlock;
if (count > 0) {
beginRemoveRows(parentIndex, pos, pos+count-1);
while(startOfBlock != oldIter) {
while (startOfBlock != oldIter) {
++startOfBlock;
oldNodeList.removeAt(pos);
}
@@ -1086,7 +1084,7 @@ void FlatModel::removed(FolderNode* parentNode, const QList<Node*> &newNodeList)
}
QList<Node *>::const_iterator startOfBlock = oldIter;
while(*oldIter != *newIter)
while (*oldIter != *newIter)
++oldIter;
// startOfBlock is the first that was diffrent
// oldIter points to the new position of newIter
@@ -1095,7 +1093,7 @@ void FlatModel::removed(FolderNode* parentNode, const QList<Node*> &newNodeList)
int pos = startOfBlock - oldNodeList.constBegin();
int count = oldIter - startOfBlock;
beginRemoveRows(parentIndex, pos, pos + count - 1);
while(startOfBlock != oldIter) {
while (startOfBlock != oldIter) {
++startOfBlock;
oldNodeList.removeAt(pos);
}
@@ -1125,7 +1123,7 @@ void FlatModel::foldersAdded()
void FlatModel::foldersAboutToBeRemoved(FolderNode *parentFolder, const QList<FolderNode*> &staleFolders)
{
QSet<Node *> blackList;
foreach(FolderNode * node, staleFolders)
foreach (FolderNode *node, staleFolders)
blackList.insert(node);
FolderNode *folderNode = visibleFolderNode(parentFolder);
@@ -1137,7 +1135,7 @@ void FlatModel::foldersAboutToBeRemoved(FolderNode *parentFolder, const QList<Fo
void FlatModel::removeFromCache(QList<FolderNode *> list)
{
foreach(FolderNode * fn, list) {
foreach (FolderNode *fn, list) {
removeFromCache(fn->subFolderNodes());
m_childNodes.remove(fn);
}
@@ -1170,7 +1168,7 @@ void FlatModel::filesAboutToBeRemoved(FolderNode *folder, const QList<FileNode*>
FolderNode *folderNode = visibleFolderNode(folder);
QSet<Node *> blackList;
foreach(Node* node, staleFiles)
foreach(Node *node, staleFiles)
blackList.insert(node);
// Now get the new List for that folder

9
src/plugins/projectexplorer/projectwindow.cpp
View File

@@ -230,13 +230,11 @@ void ProjectWindow::updateTreeWidget()
Project *ProjectWindow::findProject(const QString &path) const
{
QList<Project*> projects = m_session->projects();
foreach(Project* project, projects) {
if (project->file()->fileName() == path) {
foreach (Project* project, projects)
if (project->file()->fileName() == path)
return project;
}
}
return 0;
}
}
void ProjectWindow::handleCurrentItemChanged(QTreeWidgetItem *current)
@@ -244,7 +242,6 @@ void ProjectWindow::handleCurrentItemChanged(QTreeWidgetItem *current)
if (current) {
QString path = current->text(2);
if (Project *project = findProject(path)) {
m_projectExplorer->setCurrentFile(project, path);
showProperties(project, QModelIndex());
return;

5
src/plugins/projectexplorer/projectwizardpage.cpp
View File

@@ -99,7 +99,7 @@ void ProjectWizardPage::setAddToVersionControlEnabled(bool b)
void ProjectWizardPage::changeEvent(QEvent *e)
{
switch(e->type()) {
switch (e->type()) {
case QEvent::LanguageChange:
m_ui->retranslateUi(this);
break;
@@ -115,7 +115,8 @@ void ProjectWizardPage::setVCSDisplay(const QString &vcsName)
void ProjectWizardPage::setFilesDisplay(const QStringList &files)
{
QString fileMessage; {
QString fileMessage;
{
QTextStream str(&fileMessage);
str << "<html>Files to be added:<pre>";
const QStringList::const_iterator cend = files.constEnd();

2
src/plugins/projectexplorer/removefiledialog.cpp
View File

@@ -59,7 +59,7 @@ bool RemoveFileDialog::isDeleteFileChecked() const
void RemoveFileDialog::changeEvent(QEvent *e)
{
switch(e->type()) {
switch (e->type()) {
case QEvent::LanguageChange:
m_ui->retranslateUi(this);
break;

12
src/plugins/projectexplorer/session.cpp
View File

@@ -387,10 +387,10 @@ SessionManager::SessionManager(Core::ICore *core, QObject *parent)
dir.mkpath(configDir + "/qtcreator");
// Move sessions to that directory
foreach(const QString &session, sessions()) {
foreach (const QString &session, sessions()) {
QFile file(configDir + "/" + session + ".qws");
if (file.exists())
if(file.copy(configDir + "/qtcreator/" + session + ".qws"))
if (file.copy(configDir + "/qtcreator/" + session + ".qws"))
file.remove();
}
}
@@ -413,15 +413,15 @@ SessionManager::~SessionManager()
bool SessionManager::isDefaultVirgin() const
{
return (isDefaultSession(m_sessionName)
return isDefaultSession(m_sessionName)
&& projects().isEmpty()
&& m_core->editorManager()->openedEditors().isEmpty());
&& m_core->editorManager()->openedEditors().isEmpty();
}
bool SessionManager::isDefaultSession(const QString &session) const
{
return (session == QLatin1String("default"));
return session == QLatin1String("default");
}
@@ -1082,7 +1082,7 @@ bool SessionManager::loadSession(const QString &session)
}
} else {
// Create a new session with that name
if(!createImpl(sessionNameToFileName(session)))
if (!createImpl(sessionNameToFileName(session)))
return false;
updateName(session);
return true;

2
src/plugins/projectexplorer/sessiondialog.cpp
View File

@@ -128,7 +128,7 @@ SessionDialog::SessionDialog(SessionManager *sessionManager, const QString &last
this, SLOT(updateActions()));
QStringList sessions = sessionManager->sessions();
foreach(const QString &session, sessions) {
foreach (const QString &session, sessions) {
m_ui.sessionList->addItem(session);
if (session == lastSession)
m_ui.sessionList->setCurrentRow(m_ui.sessionList->count() - 1);

4
src/plugins/projectexplorer/taskwindow.cpp
View File

@@ -441,7 +441,7 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
int height = 0;
QTextLayout tl(description);
tl.beginLayout();
while(true) {
while (true) {
QTextLine line = tl.createLine();
if (!line.isValid())
break;
@@ -528,7 +528,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
int height = 0;
QTextLayout tl(description);
tl.beginLayout();
while(true) {
while (true) {
QTextLine line = tl.createLine();
if (!line.isValid())
break;

22
src/plugins/qt4projectmanager/cesdkhandler.cpp
View File

@@ -41,13 +41,13 @@ using namespace Qt4ProjectManager::Internal;
using ProjectExplorer::Environment;
CeSdkInfo::CeSdkInfo()
: m_major(0) , m_minor(0)
: m_major(0), m_minor(0)
{
}
Environment CeSdkInfo::addToEnvironment(const Environment &env)
{
qDebug()<<"adding "<<name()<< "to Environment";
qDebug() << "adding " << name() << "to Environment";
Environment e(env);
e.set("INCLUDE", m_include);
e.set("LIB", m_lib);
@@ -66,21 +66,21 @@ QString CeSdkHandler::platformName(const QString &qtpath)
QString CE_SDK;
QString CE_ARCH;
QFile f(qtpath);
if(f.exists() && f.open(QIODevice::ReadOnly)) {
while(!f.atEnd()) {
if (f.exists() && f.open(QIODevice::ReadOnly)) {
while (!f.atEnd()) {
QByteArray line = f.readLine();
if(line.startsWith("CE_SDK")) {
if (line.startsWith("CE_SDK")) {
int index = line.indexOf('=');
if(index >= 0) {
if (index >= 0) {
CE_SDK = line.mid(index + 1).trimmed();
}
} else if(line.startsWith("CE_ARCH")) {
} else if (line.startsWith("CE_ARCH")) {
int index = line.indexOf('=');
if(index >= 0) {
if (index >= 0) {
CE_ARCH = line.mid(index + 1).trimmed();
}
}
if(!CE_SDK.isEmpty() && !CE_ARCH.isEmpty()) {
if (!CE_SDK.isEmpty() && !CE_ARCH.isEmpty()) {
platformName = CE_SDK + " (" + CE_ARCH + ")";
break;
}
@@ -146,9 +146,9 @@ bool CeSdkHandler::parse(const QString &vsdir)
CeSdkInfo CeSdkHandler::find(const QString &name)
{
qDebug()<<"looking for platform "<<name;
qDebug() << "looking for platform " << name;
for (QList<CeSdkInfo>::iterator it = m_list.begin(); it != m_list.end(); ++it) {
qDebug()<<"...."<<it->name();
qDebug() << "...." << it->name();
if (it->name() == name)
return *it;
}

4
src/plugins/qt4projectmanager/deployhelper.cpp
View File

@@ -60,9 +60,9 @@ bool DeployHelperRunStep::init(const QString &configuration)
//find target
m_exec = "";
QStringList targets = QStringList(); //TODO fix m_pro->qmakeTarget();
foreach(const QString& target, targets) {
foreach (const QString &target, targets) {
QFileInfo fi(m_appdir + QLatin1Char('/') + target);
if(fi.exists())
if (fi.exists())
m_exec = target;
break;
}

4
src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp
View File

@@ -74,7 +74,7 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
QString destDir = m_buildDirectory + "/qtc-gdbmacros/";
QDir dir;
dir.mkpath(destDir);
foreach(const QString &file, files) {
foreach (const QString &file, files) {
QFile destination(destDir + file);
if (destination.exists())
destination.remove();
@@ -116,7 +116,7 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
QStringList makeargs = ms->value(m_buildConfiguration, "makeargs").toStringList();
if (makeargs.contains("debug")) {
makeArguments << "debug";
} else if(makeargs.contains("release")) {
} else if (makeargs.contains("release")) {
makeArguments << "release";
}
}

10
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -69,7 +69,7 @@ ProjectExplorer::BuildParserInterface *MakeStep::buildParser(const QtVersion * c
{
QString buildParser;
QtVersion::ToolchainType type = version->toolchainType();
if( type == QtVersion::MSVC || type == QtVersion::WINCE)
if ( type == QtVersion::MSVC || type == QtVersion::WINCE)
buildParser = Constants::BUILD_PARSER_MSVC;
else
buildParser = Constants::BUILD_PARSER_GCC;
@@ -92,18 +92,18 @@ bool MakeStep::init(const QString &name)
QString workingDirectory;
if (project()->value(name, "useShadowBuild").toBool())
workingDirectory = project()->value(name, "buildDirectory").toString();
if(workingDirectory.isEmpty())
if (workingDirectory.isEmpty())
workingDirectory = QFileInfo(project()->file()->fileName()).absolutePath();
setWorkingDirectory(name, workingDirectory);
//NBS only dependency on Qt4Project, we probably simply need a MakeProject from which Qt4Project derives
QString makeCmd = qobject_cast<Qt4Project *>(project())->qtVersion(name)->makeCommand();
if(!value(name, "makeCmd").toString().isEmpty())
if (!value(name, "makeCmd").toString().isEmpty())
makeCmd = value(name, "makeCmd").toString();
if (!QFileInfo(makeCmd).isAbsolute()) {
// Try to detect command in environment
QString tmp = environment.searchInPath(makeCmd);
if(tmp == QString::null) {
if (tmp == QString::null) {
emit addToOutputWindow(tr("<font color=\"#ff0000\">Could not find make command: %1 "\
"in the build environment</font>").arg(makeCmd));
return false;
@@ -291,7 +291,7 @@ void MakeStepConfigWidget::init(const QString &buildConfiguration)
bool showPage0 = buildConfiguration.isNull();
m_ui.stackedWidget->setCurrentIndex(showPage0? 0 : 1);
if(!showPage0) {
if (!showPage0) {
Qt4Project *pro = qobject_cast<Qt4Project *>(m_makeStep->project());
m_ui.makeLabel->setText(tr("Override %1:").arg(pro->qtVersion(buildConfiguration)->makeCommand()));

16
src/plugins/qt4projectmanager/msvcenvironment.cpp
View File

@@ -66,7 +66,7 @@ QList<MSVCEnvironment> MSVCEnvironment::availableVersions()
QSettings registry("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7",
QSettings::NativeFormat);
QStringList versions = registry.allKeys();
foreach(const QString &version, versions) {
foreach (const QString &version, versions) {
QString dir = registry.value(version).toString();
result << MSVCEnvironment(version, dir);
}
@@ -92,7 +92,7 @@ Environment MSVCEnvironment::addToEnvironment(const Environment &env) const
QString varsbat = m_path + "Common7\\Tools\\vsvars32.bat";
if (QFileInfo(varsbat).exists()) {
QTemporaryFile tf(QDir::tempPath() + "\\XXXXXX.bat");
if(!tf.open())
if (!tf.open())
return e;
QString filename = tf.fileName();
tf.write("call \"" + varsbat.toLocal8Bit()+"\"\r\n");
@@ -107,13 +107,13 @@ Environment MSVCEnvironment::addToEnvironment(const Environment &env) const
tf.close();
QFile vars(QDir::tempPath() + "\\qtcreator-msvc-environment.txt");
if(vars.exists() && vars.open(QIODevice::ReadOnly)) {
while(!vars.atEnd()) {
if (vars.exists() && vars.open(QIODevice::ReadOnly)) {
while (!vars.atEnd()) {
QByteArray line = vars.readLine();
QString line2 = QString::fromLocal8Bit(line);
line2 = line2.trimmed();
QRegExp regexp("(\\w*)=(.*)");
if(regexp.exactMatch(line2)) {
if (regexp.exactMatch(line2)) {
QString variable = regexp.cap(1);
QString value = regexp.cap(2);
value.replace('%' + variable + '%', e.value(variable));
@@ -137,13 +137,13 @@ Environment MSVCEnvironment::addToEnvironment(const Environment &env) const
// QFile varsbat(m_path + "Common7\\Tools\\vsvars32.bat");
// if(varsbat.exists() && varsbat.open(QIODevice::ReadOnly)) {
// while(!varsbat.atEnd()) {
// if (varsbat.exists() && varsbat.open(QIODevice::ReadOnly)) {
// while (!varsbat.atEnd()) {
// QByteArray line = varsbat.readLine();
// QString line2 = QString::fromLocal8Bit(line);
// line2 = line2.trimmed();
// QRegExp regexp("\\s*@?(S|s)(E|e)(T|t)\\s*(\\w*)=(.*)");
// if(regexp.exactMatch(line2)) {
// if (regexp.exactMatch(line2)) {
// QString variable = regexp.cap(4);
// QString value = regexp.cap(5);
// value.replace('%' + variable + '%', e.value(variable));

2
src/plugins/qt4projectmanager/profilereader.cpp
View File

@@ -45,7 +45,7 @@ ProFileReader::ProFileReader()
ProFileReader::~ProFileReader()
{
foreach(ProFile *pf, m_proFiles)
foreach (ProFile *pf, m_proFiles)
delete pf;
}

4
src/plugins/qt4projectmanager/qmakestep.cpp
View File

@@ -65,7 +65,7 @@ QStringList QMakeStep::arguments(const QString &buildConfiguration)
QStringList arguments;
arguments << project()->file()->fileName();
if (!additonalArguments.contains("-spec")) {
if(m_pro->value("useVBOX").toBool()) { //NBS TODO don't special case VBOX like this
if (m_pro->value("useVBOX").toBool()) { //NBS TODO don't special case VBOX like this
arguments << "-spec" << "linux-i686fb-g++";
arguments << "-unix";
} else {
@@ -116,7 +116,7 @@ bool QMakeStep::init(const QString &name)
QString workingDirectory = m_pro->buildDirectory(name);
Environment environment = m_pro->environment(name);
if(!environment.value("QMAKESPEC").isEmpty() && environment.value("QMAKESPEC") != qtVersion->mkspec())
if (!environment.value("QMAKESPEC").isEmpty() && environment.value("QMAKESPEC") != qtVersion->mkspec())
emit addToOutputWindow(tr("QMAKESPEC set to ") + environment.value("QMAKESPEC") +
tr(" overrides mkspec of selected qt ")+qtVersion->mkspec());

20
src/plugins/qt4projectmanager/qt4buildconfigwidget.cpp
View File

@@ -118,31 +118,31 @@ void Qt4BuildConfigWidget::setupQtVersionsComboBox()
if (m_buildConfiguration.isEmpty()) // not yet initialized
return;
disconnect(m_ui->qtVersionComboBox, SIGNAL(currentIndexChanged(const QString &)),
this, SLOT(qtVersionComboBoxCurrentIndexChanged(const QString &)));
disconnect(m_ui->qtVersionComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(qtVersionComboBoxCurrentIndexChanged(QString)));
m_ui->qtVersionComboBox->clear();
m_ui->qtVersionComboBox->addItem(tr("Default Qt Version"), 0);
if(m_pro->qtVersionId(m_buildConfiguration) == 0) {
if (m_pro->qtVersionId(m_buildConfiguration) == 0) {
m_ui->qtVersionComboBox->setCurrentIndex(0);
m_ui->invalidQtWarningLabel->setVisible(false);
}
// Add Qt Versions to the combo box
QtVersionManager *vm = m_pro->qt4ProjectManager()->versionManager();
const QList<QtVersion *> &versions = vm->versions();
for(int i=0; i<versions.size(); ++i) {
for (int i = 0; i < versions.size(); ++i) {
m_ui->qtVersionComboBox->addItem(versions.at(i)->name(), versions.at(i)->uniqueId());
if(versions.at(i)->uniqueId() == m_pro->qtVersionId(m_buildConfiguration)) {
m_ui->qtVersionComboBox->setCurrentIndex(i+1);
if (versions.at(i)->uniqueId() == m_pro->qtVersionId(m_buildConfiguration)) {
m_ui->qtVersionComboBox->setCurrentIndex(i + 1);
m_ui->invalidQtWarningLabel->setVisible(!versions.at(i)->isValid());
}
}
// And connect again
connect(m_ui->qtVersionComboBox, SIGNAL(currentIndexChanged(const QString &)),
this, SLOT(qtVersionComboBoxCurrentIndexChanged(const QString &)));
connect(m_ui->qtVersionComboBox, SIGNAL(currentIndexChanged(QString)),
this, SLOT(qtVersionComboBoxCurrentIndexChanged(QString)));
}
void Qt4BuildConfigWidget::shadowBuildButtonClicked()
@@ -180,7 +180,7 @@ void Qt4BuildConfigWidget::shadowBuildLineEditTextChanged()
m_ui->importLabel->setVisible(false);
if (m_ui->shadowBuildCheckBox->isChecked()) {
QString qtPath = m_pro->qt4ProjectManager()->versionManager()->findQtVersionFromMakefile(m_ui->shadowBuildLineEdit->text());
if(!qtPath.isEmpty()) {
if (!qtPath.isEmpty()) {
m_ui->importLabel->setVisible(true);
}
}
@@ -252,7 +252,7 @@ void Qt4BuildConfigWidget::qtVersionComboBoxCurrentIndexChanged(const QString &)
}
bool isValid = m_pro->qt4ProjectManager()->versionManager()->version(newQtVersion)->isValid();
m_ui->invalidQtWarningLabel->setVisible(!isValid);
if(newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) {
if (newQtVersion != m_pro->qtVersionId(m_buildConfiguration)) {
m_pro->setQtVersion(m_buildConfiguration, newQtVersion);
m_pro->update();
}

8
src/plugins/qt4projectmanager/qt4buildenvironmentwidget.cpp
View File

@@ -127,7 +127,7 @@ void Qt4BuildEnvironmentWidget::removeEnvironmentButtonClicked()
void Qt4BuildEnvironmentWidget::unsetEnvironmentButtonClicked()
{
const QString &name = m_environmentModel->indexToVariable(m_ui->environmentTreeView->currentIndex());
if(!m_environmentModel->isInBaseEnvironment(name) && m_environmentModel->mergedEnvironments())
if (!m_environmentModel->isInBaseEnvironment(name) && m_environmentModel->mergedEnvironments())
m_environmentModel->removeVariable(name);
else
m_environmentModel->unset(name);
@@ -138,7 +138,7 @@ void Qt4BuildEnvironmentWidget::switchEnvironmentTab(int newTab)
{
bool mergedEnvironments = (newTab == 0);
m_environmentModel->setMergedEnvironments(mergedEnvironments);
if(mergedEnvironments) {
if (mergedEnvironments) {
m_ui->removeButton->setText(tr("Reset"));
} else {
m_ui->removeButton->setText(tr("Remove"));
@@ -153,8 +153,8 @@ void Qt4BuildEnvironmentWidget::updateButtonsEnabled()
void Qt4BuildEnvironmentWidget::environmentCurrentIndexChanged(const QModelIndex &current, const QModelIndex &previous)
{
Q_UNUSED(previous)
if(current.isValid()) {
if(m_environmentModel->mergedEnvironments()) {
if (current.isValid()) {
if (m_environmentModel->mergedEnvironments()) {
const QString &name = m_environmentModel->indexToVariable(current);
bool modified = m_environmentModel->isInBaseEnvironment(name) && m_environmentModel->changes(name);
bool unset = m_environmentModel->isUnset(name);

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -321,7 +321,7 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
}
ProFile *includeFile = reader->proFileFor(m_projectFilePath);
if(!includeFile) {
if (!includeFile) {
m_project->proFileParseError(tr("Error while changing pro file %1.").arg(m_projectFilePath));
}
@@ -418,7 +418,7 @@ void Qt4PriFileNode::save(ProFile *includeFile)
Core::FileManager *fileManager = core->fileManager();
QList<Core::IFile *> allFileHandles = fileManager->managedFiles(includeFile->fileName());
Core::IFile *modifiedFileHandle = 0;
foreach(Core::IFile *file, allFileHandles)
foreach (Core::IFile *file, allFileHandles)
if (file->fileName() == includeFile->fileName())
modifiedFileHandle = file;

14
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -273,7 +273,7 @@ void Qt4Project::qtVersionsChanged()
foreach (QString bc, buildConfigurations()) {
if (!qt4ProjectManager()->versionManager()->version(qtVersionId(bc))->isValid()) {
setQtVersion(bc, 0);
if(bc == activeBuildConfiguration())
if (bc == activeBuildConfiguration())
update();
}
}
@@ -663,7 +663,7 @@ QString Qt4Project::buildDirectory(const QString &buildConfiguration) const
QString workingDirectory;
if (value(buildConfiguration, "useShadowBuild").toBool())
workingDirectory = value(buildConfiguration, "buildDirectory").toString();
if(workingDirectory.isEmpty())
if (workingDirectory.isEmpty())
workingDirectory = QFileInfo(file()->fileName()).absolutePath();
return workingDirectory;
}
@@ -698,7 +698,7 @@ int Qt4Project::qtVersionId(const QString &buildConfiguration) const
qDebug()<<"Looking for qtVersion ID of "<<buildConfiguration;
int id = 0;
QVariant vid = value(buildConfiguration, "QtVersionId");
if(vid.isValid()) {
if (vid.isValid()) {
id = vid.toInt();
if (m_manager->versionManager()->version(id)->isValid()) {
return id;
@@ -711,10 +711,10 @@ int Qt4Project::qtVersionId(const QString &buildConfiguration) const
QString vname = value(buildConfiguration, "QtVersion").toString();
if (debug)
qDebug()<<" Backward compatibility reading QtVersion"<<vname;
if(!vname.isEmpty()) {
if (!vname.isEmpty()) {
const QList<QtVersion *> &versions = m_manager->versionManager()->versions();
foreach (const QtVersion * const version, versions) {
if(version->name() == vname) {
if (version->name() == vname) {
if (debug)
qDebug()<<"found name in versions";
const_cast<Qt4Project *>(this)->setValue(buildConfiguration, "QtVersionId", version->uniqueId());
@@ -828,7 +828,7 @@ void Qt4Project::checkForDeletedApplicationProjects()
bool resetActiveRunConfiguration = false;
QSharedPointer<RunConfiguration> rc(new ProjectExplorer::CustomExecutableRunConfiguration(this));
foreach(QSharedPointer<Qt4RunConfiguration> qt4rc, removeList) {
foreach (QSharedPointer<Qt4RunConfiguration> qt4rc, removeList) {
removeRunConfiguration(qt4rc);
if (activeRunConfiguration() == qt4rc)
resetActiveRunConfiguration = true;
@@ -905,7 +905,7 @@ bool Qt4Project::hasSubNode(Qt4PriFileNode *root, const QString &path)
foreach (FolderNode *fn, root->subFolderNodes()) {
if (qobject_cast<Qt4ProFileNode *>(fn)) {
// we aren't interested in pro file nodes
} else if(Qt4PriFileNode *qt4prifilenode = qobject_cast<Qt4PriFileNode *>(fn)) {
} else if (Qt4PriFileNode *qt4prifilenode = qobject_cast<Qt4PriFileNode *>(fn)) {
if (hasSubNode(qt4prifilenode, path))
return true;
}

3
src/plugins/qt4projectmanager/qt4projectmanager.cpp
View File

@@ -102,9 +102,8 @@ void Qt4Manager::unregisterProject(Qt4Project *project)
void Qt4Manager::notifyChanged(const QString &name)
{
foreach(Qt4Project *pro, m_projects) {
foreach (Qt4Project *pro, m_projects)
pro->notifyChanged(name);
}
}
void Qt4Manager::init()

4
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View File

@@ -297,7 +297,7 @@ QString Qt4RunConfiguration::qmakeBuildConfigFromBuildConfiguration(const QStrin
QStringList makeargs = ms->value(buildConfigurationName, "makeargs").toStringList();
if (makeargs.contains("debug"))
return "debug";
else if(makeargs.contains("release"))
else if (makeargs.contains("release"))
return "release";
// Oh we don't have an explicit make argument
@@ -428,7 +428,7 @@ QStringList Qt4RunConfigurationFactoryUser::canCreate(ProjectExplorer::Project *
if (qt4project) {
QStringList applicationProFiles;
QList<Qt4ProFileNode *> list = qt4project->applicationProFiles();
foreach(Qt4ProFileNode * node, list) {
foreach (Qt4ProFileNode * node, list) {
applicationProFiles.append("Qt4RunConfiguration." + node->path());
}
return applicationProFiles;

102
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -158,7 +158,7 @@ QWidget *QtVersionManager::createPage(QWidget *parent)
void QtVersionManager::updateUniqueIdToIndexMap()
{
m_uniqueIdToIndex.clear();
for(int i=0; i<m_versions.size(); ++i)
for (int i = 0; i < m_versions.size(); ++i)
m_uniqueIdToIndex.insert(m_versions.at(i)->uniqueId(), i);
}
@@ -225,7 +225,7 @@ QtVersion *QtVersionManager::version(int id) const
if (pos != -1)
return m_versions.at(pos);
if(m_defaultVersion < m_versions.count())
if (m_defaultVersion < m_versions.count())
return m_versions.at(m_defaultVersion);
else
return m_emptyVersion;
@@ -248,17 +248,17 @@ void QtVersionManager::addNewVersionsFromInstaller()
bool defaultVersionWasReset = false;
foreach (QString newVersion, newVersionsList) {
QStringList newVersionData = newVersion.split('=');
if(newVersionData.count()>=2) {
if (newVersionData.count()>=2) {
if (QDir(newVersionData[1]).exists()) {
QtVersion *version = new QtVersion(newVersionData[0], newVersionData[1], m_idcount++ );
if(newVersionData.count() >= 3)
if (newVersionData.count() >= 3)
version->setMingwDirectory(newVersionData[2]);
if(newVersionData.count() >= 4)
if (newVersionData.count() >= 4)
version->setPrependPath(newVersionData[3]);
bool versionWasAlreadyInList = false;
foreach(const QtVersion * const it, m_versions) {
if(QDir(version->path()).canonicalPath() == QDir(it->path()).canonicalPath()) {
if (QDir(version->path()).canonicalPath() == QDir(it->path()).canonicalPath()) {
versionWasAlreadyInList = true;
break;
}
@@ -352,7 +352,7 @@ QString QtVersionManager::findSystemQt() const
QtVersion *QtVersionManager::currentQtVersion() const
{
if(m_defaultVersion < m_versions.count())
if (m_defaultVersion < m_versions.count())
return m_versions.at(m_defaultVersion);
else
return m_emptyVersion;
@@ -468,27 +468,27 @@ void QtDirWidget::updateState()
void QtDirWidget::showEnvironmentPage(QTreeWidgetItem *item)
{
m_ui.msvcComboBox->setVisible(false);
if(item) {
if (item) {
int index = m_ui.qtdirList->indexOfTopLevelItem(item);
m_ui.errorLabel->setText("");
QtVersion::ToolchainType t = m_versions.at(index)->toolchainType();
if(t == QtVersion::MinGW) {
if (t == QtVersion::MinGW) {
m_ui.msvcComboBox->setVisible(false);
m_ui.msvcLabel->setVisible(false);
m_ui.mingwLineEdit->setVisible(true);
m_ui.mingwLabel->setVisible(true);
m_ui.mingwBrowseButton->setVisible(true);
m_ui.mingwLineEdit->setText(m_versions.at(index)->mingwDirectory());
} else if(t == QtVersion::MSVC || t == QtVersion::WINCE){
} else if (t == QtVersion::MSVC || t == QtVersion::WINCE){
m_ui.msvcComboBox->setVisible(false);
m_ui.msvcLabel->setVisible(true);
m_ui.mingwLineEdit->setVisible(false);
m_ui.mingwLabel->setVisible(false);
m_ui.mingwBrowseButton->setVisible(false);
QList<MSVCEnvironment> msvcenvironments = MSVCEnvironment::availableVersions();
if(msvcenvironments.count() == 0) {
if (msvcenvironments.count() == 0) {
m_ui.msvcLabel->setText(tr("No Visual Studio Installation found"));
} else if(msvcenvironments.count() == 1) {
} else if (msvcenvironments.count() == 1) {
m_ui.msvcLabel->setText( msvcenvironments.at(0).description());
} else {
m_ui.msvcComboBox->setVisible(true);
@@ -503,7 +503,7 @@ void QtDirWidget::showEnvironmentPage(QTreeWidgetItem *item)
}
m_ui.msvcComboBox->blockSignals(block);
}
} else if(t == QtVersion::INVALID) {
} else if (t == QtVersion::INVALID) {
m_ui.msvcComboBox->setVisible(false);
m_ui.msvcLabel->setVisible(false);
m_ui.mingwLineEdit->setVisible(false);
@@ -536,7 +536,7 @@ void QtDirWidget::showEnvironmentPage(QTreeWidgetItem *item)
void QtDirWidget::versionChanged(QTreeWidgetItem *item, QTreeWidgetItem *old)
{
if(old) {
if (old) {
fixQtVersionName(m_ui.qtdirList->indexOfTopLevelItem(old));
}
if (item) {
@@ -607,7 +607,7 @@ void QtDirWidget::updateCurrentQtName()
void QtDirWidget::finish()
{
if(QTreeWidgetItem *item = m_ui.qtdirList->currentItem())
if (QTreeWidgetItem *item = m_ui.qtdirList->currentItem())
fixQtVersionName(m_ui.qtdirList->indexOfTopLevelItem(item));
}
@@ -618,9 +618,9 @@ void QtDirWidget::finish()
void QtDirWidget::fixQtVersionName(int index)
{
int count = m_versions.count();
for(int i=0; i<count; ++i) {
if(i != index) {
if(m_versions.at(i)->name() == m_versions.at(index)->name()) {
for (int i = 0; i < count; ++i) {
if (i != index) {
if (m_versions.at(i)->name() == m_versions.at(index)->name()) {
// Same name, find new name
QString name = m_versions.at(index)->name();
QRegExp regexp("^(.*)\\((\\d)\\)$");
@@ -672,7 +672,7 @@ void QtDirWidget::msvcVersionChanged()
//get descriptionx
QList<MSVCEnvironment> msvcEnvironments = MSVCEnvironment::availableVersions();
foreach(const MSVCEnvironment &msvcEnv, msvcEnvironments) {
if(msvcEnv.name() == msvcVersion) {
if (msvcEnv.name() == msvcVersion) {
m_ui.msvcLabel->setText(msvcEnv.description());
break;
}
@@ -697,7 +697,7 @@ QtVersion::QtVersion(const QString &name, const QString &path, int id, bool isSy
: m_name(name), m_isSystemVersion(isSystemVersion), m_notInstalled(false), m_defaultConfigIsDebug(true), m_defaultConfigIsDebugAndRelease(true)
{
setPath(path);
if(id == -1)
if (id == -1)
m_id = getUniqueId();
else
m_id = id;
@@ -872,7 +872,7 @@ QtVersion::QmakeBuildConfig QtVersionManager::scanMakefileForQmakeConfig(const Q
//Now chop into parts that are intresting
QStringList parts;
int lastpos = 0;
for(int i=1; i<line.size(); ++i) {
for (int i = 1; i < line.size(); ++i) {
if (line.at(i) == QLatin1Char(' ') && line.at(i-1) != QLatin1Char('\\')) {
// found a part
parts.append(line.mid(lastpos, i-lastpos));
@@ -886,7 +886,7 @@ QtVersion::QmakeBuildConfig QtVersionManager::scanMakefileForQmakeConfig(const Q
qDebug()<<"part appended:"<<line.mid(lastpos);
foreach(const QString &part, parts) {
if(debugScan)
if (debugScan)
qDebug()<<"now interpreting part"<<part;
bool setFlags;
// Now try to understand each part for that we do a rather stupid approach, optimize it if you care
@@ -905,7 +905,7 @@ QtVersion::QmakeBuildConfig QtVersionManager::scanMakefileForQmakeConfig(const Q
qDebug()<<"part has setFlags:"<<setFlags;
// now loop forward, looking for something that looks like debug, release or debug_and_release
for(int i=0; i<part.size(); ++i) {
for (int i = 0; i < part.size(); ++i) {
int left = part.size() - i;
if (left >= 17 && QStringRef(&part, i, 17) == "debug_and_release") {
if (setFlags)
@@ -922,7 +922,7 @@ QtVersion::QmakeBuildConfig QtVersionManager::scanMakefileForQmakeConfig(const Q
result = QtVersion::QmakeBuildConfig(result | QtVersion::DebugBuild);
if (debugScan)
qDebug()<<"found release new value"<<result;
i +=7;
i += 7;
} else if (left >= 5 && QStringRef(&part, i, 5) == "debug") {
if (setFlags)
result = QtVersion::QmakeBuildConfig(result | QtVersion::DebugBuild);
@@ -930,7 +930,7 @@ QtVersion::QmakeBuildConfig QtVersionManager::scanMakefileForQmakeConfig(const Q
result = QtVersion::QmakeBuildConfig(result & ~QtVersion::DebugBuild);
if (debugScan)
qDebug()<<"found debug new value"<<result;
i+=5;
i += 5;
}
}
}
@@ -1016,9 +1016,9 @@ void QtVersion::updateVersionInfo() const
foreach(const QString &value, values) {
if (value == "debug")
m_defaultConfigIsDebug = true;
else if(value == "release")
else if (value == "release")
m_defaultConfigIsDebug = false;
else if(value == "build_all")
else if (value == "build_all")
m_defaultConfigIsDebugAndRelease = true;
}
}
@@ -1043,11 +1043,11 @@ void QtVersion::updateMkSpec() const
QString mkspec;
// QFile f(path() + "/.qmake.cache");
// if (f.exists() && f.open(QIODevice::ReadOnly)) {
// while(!f.atEnd()) {
// while (!f.atEnd()) {
// QByteArray line = f.readLine();
// if(line.startsWith("QMAKESPEC")) {
// if (line.startsWith("QMAKESPEC")) {
// const QList<QByteArray> &temp = line.split('=');
// if(temp.size() == 2) {
// if (temp.size() == 2) {
// mkspec = temp.at(1).trimmed();
// if (mkspec.startsWith("$$QT_BUILD_TREE/mkspecs/"))
// mkspec = mkspec.mid(QString("$$QT_BUILD_TREE/mkspecs/").length());
@@ -1070,9 +1070,9 @@ void QtVersion::updateMkSpec() const
#ifdef Q_OS_WIN
QFile f2(mkspecPath + "/qmake.conf");
if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
while(!f2.atEnd()) {
while (!f2.atEnd()) {
QByteArray line = f2.readLine();
if(line.startsWith("QMAKESPEC_ORIGINAL")) {
if (line.startsWith("QMAKESPEC_ORIGINAL")) {
const QList<QByteArray> &temp = line.split('=');
if (temp.size() == 2) {
mkspec = temp.at(1);
@@ -1085,9 +1085,9 @@ void QtVersion::updateMkSpec() const
#elif defined(Q_OS_MAC)
QFile f2(mkspecPath + "/qmake.conf");
if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
while(!f2.atEnd()) {
while (!f2.atEnd()) {
QByteArray line = f2.readLine();
if(line.startsWith("MAKEFILE_GENERATOR")) {
if (line.startsWith("MAKEFILE_GENERATOR")) {
const QList<QByteArray> &temp = line.split('=');
if (temp.size() == 2) {
const QByteArray &value = temp.at(1);
@@ -1118,7 +1118,7 @@ void QtVersion::updateMkSpec() const
m_mkspecFullPath = mkspec;
int index = mkspec.lastIndexOf('/');
if(index == -1)
if (index == -1)
index = mkspec.lastIndexOf('\\');
QString mkspecDir = QDir(m_path + "/mkspecs/").canonicalPath();
if (index >= 0 && QDir(mkspec.left(index)).canonicalPath() == mkspecDir)
@@ -1135,7 +1135,7 @@ QString QtVersion::makeCommand() const
const QString &spec = mkspec();
if (spec.contains("win32-msvc") || spec.contains(QLatin1String("win32-icc")))
return "nmake.exe";
else if(spec.startsWith("wince"))
else if (spec.startsWith("wince"))
return "nmake.exe";
else
return "mingw32-make.exe";
@@ -1152,7 +1152,7 @@ QString QtVersion::qmakeCommand() const
return m_qmakeCommand;
QDir qtDir = path() + "/bin/";
foreach(const QString &possibleCommand, QtVersionManager::possibleQMakeCommands()) {
foreach (const QString &possibleCommand, QtVersionManager::possibleQMakeCommands()) {
QString s = qtDir.absoluteFilePath(possibleCommand);
QFileInfo qmake(s);
if (qmake.exists() && qmake.isExecutable()) {
@@ -1172,13 +1172,13 @@ QtVersion::ToolchainType QtVersion::toolchainType() const
if (!isValid())
return INVALID;
const QString &spec = mkspec();
if(spec.contains("win32-msvc") || spec.contains(QLatin1String("win32-icc")))
if (spec.contains("win32-msvc") || spec.contains(QLatin1String("win32-icc")))
return MSVC;
else if(spec == "win32-g++")
else if (spec == "win32-g++")
return MinGW;
else if(spec == QString::null)
else if (spec == QString::null)
return INVALID;
else if(spec.startsWith("wince"))
else if (spec.startsWith("wince"))
return WINCE;
else
return OTHER;
@@ -1224,32 +1224,32 @@ Environment QtVersion::addToEnvironment(const Environment &env)
// or add Mingw dirs
// or do nothing on other
QtVersion::ToolchainType t = toolchainType();
if(t == QtVersion::MinGW) {
if (t == QtVersion::MinGW) {
QFileInfo mingwFileInfo(m_mingwDirectory + "/bin");
if(mingwFileInfo.exists())
if (mingwFileInfo.exists())
e.prependOrSetPath(m_mingwDirectory + "/bin");
} else if(t == QtVersion::MSVC) {
} else if (t == QtVersion::MSVC) {
QList<MSVCEnvironment> list = MSVCEnvironment::availableVersions();
if(list.count() == 1) {
if (list.count() == 1) {
e = list.at(0).addToEnvironment(e);
} else {
foreach(const MSVCEnvironment &m, list) {
if(m.name() == m_msvcVersion) {
if (m.name() == m_msvcVersion) {
e = m.addToEnvironment(e);
break;
}
}
}
} else if(t == QtVersion::WINCE) {
} else if (t == QtVersion::WINCE) {
QString msvcPath;
// Find MSVC path
QList<MSVCEnvironment> list = MSVCEnvironment::availableVersions();
if(list.count() == 1) {
if (list.count() == 1) {
msvcPath = list.at(0).path();
e = list.at(0).addToEnvironment(e);
} else {
foreach(const MSVCEnvironment &m, list) {
if(m.name() == m_msvcVersion) {
if (m.name() == m_msvcVersion) {
e = m.addToEnvironment(e);
msvcPath = m.path();
break;
@@ -1268,8 +1268,8 @@ Environment QtVersion::addToEnvironment(const Environment &env)
CeSdkHandler cesdkhandler;
cesdkhandler.parse(msvcPath);
e = cesdkhandler.find(platformName).addToEnvironment(e);
} else if(t == QtVersion::OTHER) {
if(!m_prependPath.isEmpty())
} else if (t == QtVersion::OTHER) {
if (!m_prependPath.isEmpty())
e.prependOrSetPath(m_prependPath);
}
return e;

2
src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
View File

@@ -93,7 +93,7 @@ static QString pluginDependencies(const PluginBaseClasses *plb)
QString(QLatin1String(plb->dependentModules)).split(blank) :
QStringList();
pluginModules.push_back(QLatin1String(plb->module));
foreach(const QString &module, pluginModules) {
foreach (const QString &module, pluginModules) {
if (!dependencies.isEmpty())
dependencies += blank;
dependencies += ModulesPage::idOfModule(module);

4
src/plugins/qtscripteditor/qtscripteditor.cpp
View File

@@ -159,14 +159,12 @@ void ScriptEditor::contextMenuEvent(QContextMenuEvent *e)
if (Core::IActionContainer *mcontext = m_core->actionManager()->actionContainer(QtScriptEditor::Constants::M_CONTEXT)) {
QMenu *contextMenu = mcontext->menu();
foreach(QAction *action, contextMenu->actions()) {
foreach (QAction *action, contextMenu->actions())
menu->addAction(action);
}
}
menu->exec(e->globalPos());
delete menu;
}
} // namespace Internal

2
src/plugins/snippets/snippetswindow.cpp
View File

@@ -243,7 +243,7 @@ void SnippetsWindow::showInputWidget(bool canceled, const QString &value)
} else {
QString desc = m_currentSnippet->argumentDescription(m_requiredArgs.first());
QString def = m_currentSnippet->argumentDefault(m_requiredArgs.first());
foreach(QString arg, m_args) {
foreach (const QString &arg, m_args) {
desc = desc.arg(arg);
def = def.arg(arg);
}

7
src/plugins/subversion/subversionplugin.cpp
View File

@@ -194,7 +194,7 @@ SubversionPlugin::~SubversionPlugin()
}
if (!m_editorFactories.empty()) {
foreach(Core::IEditorFactory* pf, m_editorFactories)
foreach (Core::IEditorFactory* pf, m_editorFactories)
removeObject(pf);
qDeleteAll(m_editorFactories);
m_editorFactories.clear();
@@ -579,9 +579,8 @@ void SubversionPlugin::revertCurrentFile()
Core::FileManager *fm = m_coreInstance->fileManager();
QList<Core::IFile *> files = fm->managedFiles(file);
foreach (Core::IFile *file, files) {
foreach (Core::IFile *file, files)
fm->blockFileChange(file);
}
// revert
args.clear();
@@ -726,7 +725,7 @@ QStringList SubversionPlugin::parseStatusOutput(const QString &output) const
QStringList changeSet;
const QString newLine = QString(QLatin1Char('\n'));
const QStringList list = output.split(newLine, QString::SkipEmptyParts);
foreach (const QString& l, list) {
foreach (const QString &l, list) {
QString line(l.trimmed());
if (line.startsWith(QLatin1Char('A')) || line.startsWith(QLatin1Char('D'))
|| line.startsWith(QLatin1Char('M')))

29
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -1635,6 +1635,20 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
QRect er = e->rect();
QRect viewportRect = viewport()->rect();
const QColor baseColor = palette().base().color();
const int blendBase = (baseColor.value() > 128) ? 0 : 255;
// Darker backgrounds may need a bit more contrast
// (this calculation is temporary solution until we have a setting for this color)
const int blendFactor = (baseColor.value() > 128) ? 8 : 16;
const QColor blendColor(
(blendBase * blendFactor + baseColor.blue() * (256 - blendFactor)) / 256,
(blendBase * blendFactor + baseColor.green() * (256 - blendFactor)) / 256,
(blendBase * blendFactor + baseColor.blue() * (256 - blendFactor)) / 256);
if (d->m_visibleWrapColumn > 0) {
qreal lineX = fontMetrics().averageCharWidth() * d->m_visibleWrapColumn + offset.x() + 4;
painter.fillRect(QRectF(lineX, 0, viewportRect.width() - lineX, viewportRect.height()), blendColor);
}
// keep right margin clean from full-width selection
int maxX = offset.x() + qMax((qreal)viewportRect.width(), documentLayout->documentSize().width())
- doc->documentMargin();
@@ -1647,7 +1661,6 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
QAbstractTextDocumentLayout::PaintContext context = getPaintContext();
if (!d->m_findScope.isNull()) {
QAbstractTextDocumentLayout::Selection selection;
selection.format.setBackground(d->m_searchScopeFormat.background());
@@ -1672,20 +1685,6 @@ void BaseTextEditor::paintEvent(QPaintEvent *e)
blockSelection->lastColumn = qMax(columnA, columnB) + d->m_blockSelectionExtraX;
}
const QColor baseColor = palette().base().color();
const int blendBase = (baseColor.value() > 128) ? 0 : 255;
// Darker backgrounds may need a bit more contrast
// (this calculation is temporary solution until we have a setting for this color)
const int blendFactor = (baseColor.value() > 128) ? 8 : 16;
const QColor blendColor(
(blendBase * blendFactor + baseColor.blue() * (256 - blendFactor)) / 256,
(blendBase * blendFactor + baseColor.green() * (256 - blendFactor)) / 256,
(blendBase * blendFactor + baseColor.blue() * (256 - blendFactor)) / 256);
if (d->m_visibleWrapColumn > 0) {
qreal lineX = fontMetrics().averageCharWidth() * d->m_visibleWrapColumn + offset.x() + 4;
painter.fillRect(QRectF(lineX, 0, viewportRect.width() - lineX, viewportRect.height()), blendColor);
}
QTextBlock visibleCollapsedBlock;
QPointF visibleCollapsedBlockOffset;

6
src/plugins/texteditor/basetextmark.cpp
View File

@@ -60,9 +60,8 @@ void BaseTextMark::init()
Core::EditorManager *em = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>()->editorManager();
connect(em, SIGNAL(editorOpened(Core::IEditor *)), this, SLOT(editorOpened(Core::IEditor *)));
foreach(Core::IEditor *editor, em->openedEditors()) {
foreach (Core::IEditor *editor, em->openedEditors())
editorOpened(editor);
}
}
void BaseTextMark::editorOpened(Core::IEditor *editor)
@@ -132,7 +131,6 @@ void BaseTextMark::moveMark(const QString & /* filename */, int /* line */)
delete m_internalMark;
m_internalMark = 0;
foreach(Core::IEditor *editor, em->openedEditors()) {
foreach (Core::IEditor *editor, em->openedEditors())
editorOpened(editor);
}
}

9
src/plugins/texteditor/codecselector.cpp
View File

@@ -87,15 +87,15 @@ CodecSelector::CodecSelector(QWidget *parent, BaseTextDocument *doc)
QList<int> mibs = QTextCodec::availableMibs();
qSort(mibs);
QList<int> sortedMibs;
foreach(int mib, mibs)
foreach (int mib, mibs)
if (mib >= 0)
sortedMibs += mib;
foreach(int mib, mibs)
foreach (int mib, mibs)
if (mib < 0)
sortedMibs += mib;
int currentIndex = -1;
foreach(int mib, sortedMibs) {
foreach (int mib, sortedMibs) {
QTextCodec *c = QTextCodec::codecForMib(mib);
if (!buf.isEmpty()) {
@@ -109,9 +109,8 @@ CodecSelector::CodecSelector(QWidget *parent, BaseTextDocument *doc)
continue;
}
QString names = QString::fromLatin1(c->name());
foreach(QByteArray alias, c->aliases()) {
foreach (QByteArray alias, c->aliases())
names += QLatin1String(" / ") + QString::fromLatin1(alias);
}
if (doc->codec() == c)
currentIndex = encodings.count();
encodings << names;