From 313bdf4e780b58241031dc790ae80d08385f9ed3 Mon Sep 17 00:00:00 2001 From: Stanislav Date: Thu, 18 Sep 2014 10:25:33 +0600 Subject: [PATCH] fix --- CMakeLists.txt | 11 ----------- apps/opencs/view/world/table.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f801a4439..b25539e90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -690,17 +690,6 @@ if (WIN32) if (BUILD_MWINIIMPORTER) set_target_properties(mwiniimport PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}") endif (BUILD_MWINIIMPORTER) - - set( OMW_CFLAGS "/DWIN32_LEAN_AND_MEAN ${MT_BUILD}" ) - - string( TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE ) - - # Debug builds need /bigobj - if ( CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO" ) - set( OMW_CFLAGS "${OMW_CFLAGS} /bigobj" ) - endif ( CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO" ) - - set_property( TARGET openmw APPEND_STRING PROPERTY COMPILE_FLAGS " ${OMW_CFLAGS}" ) endif(MSVC) # Same for MinGW diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp index 05b64af01..df0b42c88 100644 --- a/apps/opencs/view/world/table.cpp +++ b/apps/opencs/view/world/table.cpp @@ -62,7 +62,7 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event) currRow = mProxyModel->mapToSource(mProxyModel->index( currRow, 0 )).row(); - CSMWorld::ColumnBase::Display colType = + CSMWorld::ColumnBase::Display colDisplay = static_cast( mModel->headerData( currCol, @@ -70,16 +70,16 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event) CSMWorld::ColumnBase::Role_Display ).toInt()); QString cellData = mModel->data(mModel->index( currRow, currCol )).toString(); - CSMWorld::UniversalId::Type colUidType = CSMWorld::TableMimeData::convertEnums( colType ); + CSMWorld::UniversalId::Type colType = CSMWorld::TableMimeData::convertEnums( colDisplay ); if ( !cellData.isEmpty() - && colUidType != CSMWorld::UniversalId::Type::Type_None ) + && colType != CSMWorld::UniversalId::Type::Type_None ) { mEditCellAction->setText(tr("Edit '").append(cellData).append("'")); menu.addAction( mEditCellAction ); - mEditCellId = CSMWorld::UniversalId( colUidType, cellData.toUtf8().constData() ); + mEditCellId = CSMWorld::UniversalId( colType, cellData.toUtf8().constData() ); } }