From b788ab8b4c0d3870d5020449e7df4aad9d7e93e1 Mon Sep 17 00:00:00 2001 From: Marek Kochanowicz Date: Thu, 20 Feb 2014 14:10:03 +0100 Subject: [PATCH] correcting --- apps/opencs/model/world/tablemimedata.cpp | 156 +++++++++++----------- apps/opencs/view/filter/editwidget.cpp | 3 +- apps/opencs/view/world/table.cpp | 2 +- 3 files changed, 80 insertions(+), 81 deletions(-) diff --git a/apps/opencs/model/world/tablemimedata.cpp b/apps/opencs/model/world/tablemimedata.cpp index 6daf9d554..de7875cc2 100644 --- a/apps/opencs/model/world/tablemimedata.cpp +++ b/apps/opencs/model/world/tablemimedata.cpp @@ -128,159 +128,159 @@ CSMWorld::UniversalId::Type CSMWorld::TableMimeData::convertEnums (CSMWorld::Col { case CSMWorld::ColumnBase::Display_Race: return CSMWorld::UniversalId::Type_Race; - break; + case CSMWorld::ColumnBase::Display_Skill: return CSMWorld::UniversalId::Type_Skill; - break; + case CSMWorld::ColumnBase::Display_Class: return CSMWorld::UniversalId::Type_Class; - break; + case CSMWorld::ColumnBase::Display_Faction: return CSMWorld::UniversalId::Type_Faction; - break; + case CSMWorld::ColumnBase::Display_Sound: return CSMWorld::UniversalId::Type_Sound; - break; + case CSMWorld::ColumnBase::Display_Region: return CSMWorld::UniversalId::Type_Region; - break; + case CSMWorld::ColumnBase::Display_Birthsign: return CSMWorld::UniversalId::Type_Birthsign; - break; + case CSMWorld::ColumnBase::Display_Spell: return CSMWorld::UniversalId::Type_Spell; - break; + case CSMWorld::ColumnBase::Display_Cell: return CSMWorld::UniversalId::Type_Cell; - break; + case CSMWorld::ColumnBase::Display_Referenceable: return CSMWorld::UniversalId::Type_Referenceable; - break; + case CSMWorld::ColumnBase::Display_Activator: return CSMWorld::UniversalId::Type_Activator; - break; + case CSMWorld::ColumnBase::Display_Potion: return CSMWorld::UniversalId::Type_Potion; - break; + case CSMWorld::ColumnBase::Display_Apparatus: return CSMWorld::UniversalId::Type_Apparatus; - break; + case CSMWorld::ColumnBase::Display_Armor: return CSMWorld::UniversalId::Type_Armor; - break; + case CSMWorld::ColumnBase::Display_Book: return CSMWorld::UniversalId::Type_Book; - break; + case CSMWorld::ColumnBase::Display_Clothing: return CSMWorld::UniversalId::Type_Clothing; - break; + case CSMWorld::ColumnBase::Display_Container: return CSMWorld::UniversalId::Type_Container; - break; + case CSMWorld::ColumnBase::Display_Creature: return CSMWorld::UniversalId::Type_Creature; - break; + case CSMWorld::ColumnBase::Display_Door: return CSMWorld::UniversalId::Type_Door; - break; + case CSMWorld::ColumnBase::Display_Ingredient: return CSMWorld::UniversalId::Type_Ingredient; - break; + case CSMWorld::ColumnBase::Display_CreatureLevelledList: return CSMWorld::UniversalId::Type_CreatureLevelledList; - break; + case CSMWorld::ColumnBase::Display_ItemLevelledList: return CSMWorld::UniversalId::Type_ItemLevelledList; - break; + case CSMWorld::ColumnBase::Display_Light: return CSMWorld::UniversalId::Type_Light; - break; + case CSMWorld::ColumnBase::Display_Lockpick: return CSMWorld::UniversalId::Type_Lockpick; - break; + case CSMWorld::ColumnBase::Display_Miscellaneous: return CSMWorld::UniversalId::Type_Miscellaneous; - break; + case CSMWorld::ColumnBase::Display_Npc: return CSMWorld::UniversalId::Type_Npc; - break; + case CSMWorld::ColumnBase::Display_Probe: return CSMWorld::UniversalId::Type_Probe; - break; + case CSMWorld::ColumnBase::Display_Repair: return CSMWorld::UniversalId::Type_Repair; - break; + case CSMWorld::ColumnBase::Display_Static: return CSMWorld::UniversalId::Type_Static; - break; + case CSMWorld::ColumnBase::Display_Weapon: return CSMWorld::UniversalId::Type_Weapon; - break; + case CSMWorld::ColumnBase::Display_Reference: return CSMWorld::UniversalId::Type_Reference; - break; + case CSMWorld::ColumnBase::Display_Filter: return CSMWorld::UniversalId::Type_Filter; - break; + case CSMWorld::ColumnBase::Display_Topic: return CSMWorld::UniversalId::Type_Topic; - break; + case CSMWorld::ColumnBase::Display_Journal: return CSMWorld::UniversalId::Type_Journal; - break; + case CSMWorld::ColumnBase::Display_TopicInfo: return CSMWorld::UniversalId::Type_TopicInfo; - break; + case CSMWorld::ColumnBase::Display_JournalInfo: return CSMWorld::UniversalId::Type_JournalInfo; - break; + case CSMWorld::ColumnBase::Display_Scene: return CSMWorld::UniversalId::Type_Scene; - break; + case CSMWorld::ColumnBase::Display_Script: return CSMWorld::UniversalId::Type_Script; - break; + default: return CSMWorld::UniversalId::Type_None; - break; + } } @@ -290,158 +290,158 @@ CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (CSMWorld::U { case CSMWorld::UniversalId::Type_Race: return CSMWorld::ColumnBase::Display_Race; - break; + case CSMWorld::UniversalId::Type_Skill: return CSMWorld::ColumnBase::Display_Skill; - break; + case CSMWorld::UniversalId::Type_Class: return CSMWorld::ColumnBase::Display_Class; - break; + case CSMWorld::UniversalId::Type_Faction: return CSMWorld::ColumnBase::Display_Faction; - break; + case CSMWorld::UniversalId::Type_Sound: return CSMWorld::ColumnBase::Display_Sound; - break; + case CSMWorld::UniversalId::Type_Region: return CSMWorld::ColumnBase::Display_Region; - break; + case CSMWorld::UniversalId::Type_Birthsign: return CSMWorld::ColumnBase::Display_Birthsign; - break; + case CSMWorld::UniversalId::Type_Spell: return CSMWorld::ColumnBase::Display_Spell; - break; + case CSMWorld::UniversalId::Type_Cell: return CSMWorld::ColumnBase::Display_Cell; - break; + case CSMWorld::UniversalId::Type_Referenceable: return CSMWorld::ColumnBase::Display_Referenceable; - break; + case CSMWorld::UniversalId::Type_Activator: return CSMWorld::ColumnBase::Display_Activator; - break; + case CSMWorld::UniversalId::Type_Potion: return CSMWorld::ColumnBase::Display_Potion; - break; + case CSMWorld::UniversalId::Type_Apparatus: return CSMWorld::ColumnBase::Display_Apparatus; - break; + case CSMWorld::UniversalId::Type_Armor: return CSMWorld::ColumnBase::Display_Armor; - break; + case CSMWorld::UniversalId::Type_Book: return CSMWorld::ColumnBase::Display_Book; - break; + case CSMWorld::UniversalId::Type_Clothing: return CSMWorld::ColumnBase::Display_Clothing; - break; + case CSMWorld::UniversalId::Type_Container: return CSMWorld::ColumnBase::Display_Container; - break; + case CSMWorld::UniversalId::Type_Creature: return CSMWorld::ColumnBase::Display_Creature; - break; + case CSMWorld::UniversalId::Type_Door: return CSMWorld::ColumnBase::Display_Door; - break; + case CSMWorld::UniversalId::Type_Ingredient: return CSMWorld::ColumnBase::Display_Ingredient; - break; + case CSMWorld::UniversalId::Type_CreatureLevelledList: return CSMWorld::ColumnBase::Display_CreatureLevelledList; - break; + case CSMWorld::UniversalId::Type_ItemLevelledList: return CSMWorld::ColumnBase::Display_ItemLevelledList; - break; + case CSMWorld::UniversalId::Type_Light: return CSMWorld::ColumnBase::Display_Light; - break; + case CSMWorld::UniversalId::Type_Lockpick: return CSMWorld::ColumnBase::Display_Lockpick; - break; + case CSMWorld::UniversalId::Type_Miscellaneous: return CSMWorld::ColumnBase::Display_Miscellaneous; - break; + case CSMWorld::UniversalId::Type_Npc: return CSMWorld::ColumnBase::Display_Npc; - break; + case CSMWorld::UniversalId::Type_Probe: return CSMWorld::ColumnBase::Display_Probe; - break; + case CSMWorld::UniversalId::Type_Repair: return CSMWorld::ColumnBase::Display_Repair; - break; + case CSMWorld::UniversalId::Type_Static: return CSMWorld::ColumnBase::Display_Static; - break; + case CSMWorld::UniversalId::Type_Weapon: return CSMWorld::ColumnBase::Display_Weapon; - break; + case CSMWorld::UniversalId::Type_Reference: return CSMWorld::ColumnBase::Display_Reference; - break; + case CSMWorld::UniversalId::Type_Filter: return CSMWorld::ColumnBase::Display_Filter; - break; + case CSMWorld::UniversalId::Type_Topic: return CSMWorld::ColumnBase::Display_Topic; - break; + case CSMWorld::UniversalId::Type_Journal: return CSMWorld::ColumnBase::Display_Journal; - break; + case CSMWorld::UniversalId::Type_TopicInfo: return CSMWorld::ColumnBase::Display_TopicInfo; - break; + case CSMWorld::UniversalId::Type_JournalInfo: return CSMWorld::ColumnBase::Display_JournalInfo; - break; + case CSMWorld::UniversalId::Type_Scene: return CSMWorld::ColumnBase::Display_Scene; - break; + case CSMWorld::UniversalId::Type_Script: return CSMWorld::ColumnBase::Display_Script; - break; + default: return CSMWorld::ColumnBase::Display_String; - break; + } } \ No newline at end of file diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp index fb1e5bcb2..2ccef17a8 100644 --- a/apps/opencs/view/filter/editwidget.cpp +++ b/apps/opencs/view/filter/editwidget.cpp @@ -63,7 +63,7 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st clear(); std::string filter(generateFilter(*filterSource.begin())); - insert(QString::fromStdString(filter)); + insert(QString::fromUtf8(filter.c_str())); for (unsigned i = 0; i < filterSource.size(); ++i) //test { @@ -86,7 +86,6 @@ std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std:: { case 0: //empty return ""; //no column to filter - break; case 1: //one column to look for multipleColumns = false; diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp index fd0ba0f19..e242365fe 100644 --- a/apps/opencs/view/world/table.cpp +++ b/apps/opencs/view/world/table.cpp @@ -496,7 +496,7 @@ void CSVWorld::Table::dropEvent(QDropEvent *event) CSMWorld::UniversalId record (mime->returnMatching (display)); std::auto_ptr command (new CSMWorld::ModifyCommand - (*mProxyModel, index, QVariant (QString::fromStdString (record.getId())))); + (*mProxyModel, index, QVariant (QString::fromUtf8 (record.getId().c_str())))); mUndoStack.push (command.release()); }