mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix formatting issues after cherry-picking commit ab0b5932f76ff57b79e894567d9a2d9bde8ffd12

Browse Source
This commit is contained in:
cc9cii 2015-07-30 10:41:18 +10:00
parent 26d617d88b
commit 7e7c028530
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/opencs/view/world/dialoguesubview.cpp
View File

@ -325,11 +325,11 @@ CSVWorld::IdContextMenu::IdContextMenu(QWidget *widget, CSMWorld::ColumnBase::Di
Q_ASSERT(mWidget != NULL); Q_ASSERT(mWidget != NULL);
Q_ASSERT(CSMWorld::ColumnBase::isId(display)); Q_ASSERT(CSMWorld::ColumnBase::isId(display));
Q_ASSERT(mIdType != CSMWorld::UniversalId::Type_None); Q_ASSERT(mIdType != CSMWorld::UniversalId::Type_None);
mWidget->setContextMenuPolicy(Qt::CustomContextMenu); mWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(mWidget, connect(mWidget,
SIGNAL(customContextMenuRequested(const QPoint &)), SIGNAL(customContextMenuRequested(const QPoint &)),
this, this,
SLOT(showContextMenu(const QPoint &))); SLOT(showContextMenu(const QPoint &)));
mEditIdAction = new QAction(this); mEditIdAction = new QAction(this);
@ -353,7 +353,7 @@ void CSVWorld::IdContextMenu::excludeId(const std::string &id)
QString CSVWorld::IdContextMenu::getWidgetValue() const QString CSVWorld::IdContextMenu::getWidgetValue() const
{ {
QLineEdit *lineEdit = qobject_cast<QLineEdit *>(mWidget); QLineEdit *lineEdit = qobject_cast<QLineEdit *>(mWidget);
QLabel *label = qobject_cast<QLabel *>(mWidget); QLabel *label = qobject_cast<QLabel *>(mWidget);
QString value = ""; QString value = "";
@ -412,7 +412,7 @@ void CSVWorld::IdContextMenu::showContextMenu(const QPoint &pos)
{ {
removeEditIdActionFromMenu(); removeEditIdActionFromMenu();
} }
if (!mContextMenu->actions().isEmpty()) if (!mContextMenu->actions().isEmpty())
{ {
mContextMenu->exec(mWidget->mapToGlobal(pos)); mContextMenu->exec(mWidget->mapToGlobal(pos));
@ -591,9 +591,9 @@ void CSVWorld::EditWidget::remake(int row)
tablesLayout->addWidget(label); tablesLayout->addWidget(label);
tablesLayout->addWidget(table); tablesLayout->addWidget(table);
connect(table, connect(table,
SIGNAL(editRequest(const CSMWorld::UniversalId &, const std::string &)), SIGNAL(editRequest(const CSMWorld::UniversalId &, const std::string &)),
this, this,
SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &))); SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)));
} }
else if (!(flags & CSMWorld::ColumnBase::Flag_Dialogue_List)) else if (!(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
@ -906,7 +906,7 @@ void CSVWorld::DialogueSubView::setEditLock (bool locked)
SimpleDialogueSubView::setEditLock (locked); SimpleDialogueSubView::setEditLock (locked);
if (mButtons) if (mButtons)
mButtons->setEditLock (locked); mButtons->setEditLock (locked);
} }
void CSVWorld::DialogueSubView::updateUserSetting (const QString& name, const QStringList& value) void CSVWorld::DialogueSubView::updateUserSetting (const QString& name, const QStringList& value)
@ -931,7 +931,7 @@ void CSVWorld::DialogueSubView::updateUserSetting (const QString& name, const QS
} }
if (mButtons) if (mButtons)
mButtons->updateUserSetting (name, value); mButtons->updateUserSetting (name, value);
} }
void CSVWorld::DialogueSubView::showPreview () void CSVWorld::DialogueSubView::showPreview ()
@ -986,5 +986,5 @@ void CSVWorld::DialogueSubView::requestFocus (const std::string& id)
QModelIndex index = getTable().getModelIndex (id, 0); QModelIndex index = getTable().getModelIndex (id, 0);
if (index.isValid()) if (index.isValid())
switchToRow (index.row()); switchToRow (index.row());
} }