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

TextEditor: Simplify HighlightDefinitionMetaData structure

Browse Source 
It's a plain value struct.

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d40
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2013-05-25 01:10:07 +02:00
committed by David Schulz
parent 92a15600a4
commit 79438adfcd
4 changed files with 42 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/generichighlighter/managedefinitionsdialog.cpp
View File

@@ -74,23 +74,23 @@ void ManageDefinitionsDialog::populateDefinitionsWidget()
// Look for this definition in the current path specified by the user, not the one
// stored in the settings. So the manager should not be queried for this information.
QString dirVersion;
QFileInfo fi(m_path + downloadData.fileName());
QFileInfo fi(m_path + downloadData.fileName);
QFile definitionFile(fi.absoluteFilePath());
if (definitionFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
const QSharedPointer<HighlightDefinitionMetaData> &data = Manager::parseMetadata(fi);
if (!data.isNull())
dirVersion = data->version();
dirVersion = data->version;
}
for (int j = 0; j < 3; ++j) {
QTableWidgetItem *item = new QTableWidgetItem;
if (j == 0)
item->setText(downloadData.name());
item->setText(downloadData.name);
else if (j == 1) {
item->setText(dirVersion);
item->setTextAlignment(Qt::AlignCenter);
} else if (j == 2) {
item->setText(downloadData.version());
item->setText(downloadData.version);
item->setTextAlignment(Qt::AlignCenter);
}
ui.definitionsTable->setItem(i, j, item);
@@ -110,7 +110,7 @@ void ManageDefinitionsDialog::downloadDefinitions()
QList<QUrl> urls;
foreach (const QModelIndex &index, ui.definitionsTable->selectionModel()->selectedRows())
urls.append(m_definitionsMetaData.at(index.row()).url());
urls.append(m_definitionsMetaData.at(index.row()).url);
Manager::instance()->downloadDefinitions(urls, m_path);
accept();
}