oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improvements for clang

Browse Source
This commit is contained in:
itsmattkc
2018-11-05 20:31:01 +11:00
parent 72fe20d857
commit d43ed66e97
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panels/project.cpp
+3 -3
View File
@@ -213,7 +213,7 @@ QString Project::get_file_name_from_path(const QString& path) {
QTreeWidgetItem* Project::new_item() {
QTreeWidgetItem* item = new QTreeWidgetItem();
item->setData(0, Qt::UserRole + 5, NULL);
item->setData(0, Qt::UserRole + 5, 0);
item->setFlags(item->flags() | Qt::ItemIsEditable);
return item;
}
@@ -699,7 +699,7 @@ void Project::clear() {
while (ui->treeWidget->topLevelItemCount() > 0) {
QTreeWidgetItem* item = ui->treeWidget->topLevelItem(0);
if (get_type_from_tree(item) != MEDIA_TYPE_SEQUENCE) delete_media(item); // already deleted
if (item->data(0, Qt::UserRole + 5) != NULL) delete reinterpret_cast<MediaThrobber*>(item->data(0, Qt::UserRole + 5).value<quintptr>());
if (item->data(0, Qt::UserRole + 5) != 0) delete reinterpret_cast<MediaThrobber*>(item->data(0, Qt::UserRole + 5).value<quintptr>());
delete item;
}
}
@@ -1485,7 +1485,7 @@ void MediaThrobber::stop(int icon_type, bool replace) {
update_ui(replace);
panel_project->source_table->viewport()->update();
item->setData(0, Qt::UserRole + 5, NULL);
item->setData(0, Qt::UserRole + 5, 0);
deleteLater();
}
project/undo.cpp
+3 -6
View File
@@ -351,7 +351,7 @@ AddMediaCommand::AddMediaCommand(QTreeWidgetItem* iitem, QTreeWidgetItem* iparen
AddMediaCommand::~AddMediaCommand() {
if (!done) {
panel_project->delete_media(item);
if (item->data(0, Qt::UserRole + 5) != NULL) delete reinterpret_cast<MediaThrobber*>(item->data(0, Qt::UserRole + 5).value<quintptr>());
if (item->data(0, Qt::UserRole + 5) != 0) delete reinterpret_cast<MediaThrobber*>(item->data(0, Qt::UserRole + 5).value<quintptr>());
delete item;
}
}
@@ -361,14 +361,11 @@ void AddMediaCommand::undo() {
bool found = false;
for (int i=0;i<panel_project->source_table->topLevelItemCount();i++) {
if (panel_project->source_table->topLevelItem(i) == item) {
dout << "item at index is:" << panel_project->source_table->topLevelItem(i)->text(0);
QTreeWidgetItem* deleted_item = panel_project->source_table->takeTopLevelItem(i);
dout << "wanted to take" << item->text(0) << "took" << deleted_item->text(0);
panel_project->source_table->takeTopLevelItem(i);
found = true;
break;
}
}
dout << "took:" << found;
} else {
parent->removeChild(item);
}
@@ -411,7 +408,7 @@ DeleteMediaCommand::DeleteMediaCommand(QTreeWidgetItem* i) :
DeleteMediaCommand::~DeleteMediaCommand() {
if (done) {
panel_project->delete_media(item);
if (item->data(0, Qt::UserRole + 5) != NULL) delete reinterpret_cast<MediaThrobber*>(item->data(0, Qt::UserRole + 5).value<quintptr>());
if (item->data(0, Qt::UserRole + 5) != 0) delete reinterpret_cast<MediaThrobber*>(item->data(0, Qt::UserRole + 5).value<quintptr>());
delete item;
}
}