OpenCS changes to allow compilation with MSVC 11.0.

apps/opencs/model/settings/usersettings.cpp

@@ -195,13 +195,13 @@ CSMSettings::UserSettings::~UserSettings()
 void CSMSettings::UserSettings::loadSettings (const QString &fileName)
 {
     mUserFilePath = QString::fromUtf8
-                            (mCfgMgr.getUserConfigPath().c_str()) + fileName.toUtf8();
+                            (mCfgMgr.getUserConfigPath().string().c_str()) + fileName.toUtf8();
 
     QString global = QString::fromUtf8
-                                (mCfgMgr.getGlobalPath().c_str()) + fileName.toUtf8();
+                                (mCfgMgr.getGlobalPath().string().c_str()) + fileName.toUtf8();
 
     QString local = QString::fromUtf8
-                                (mCfgMgr.getLocalPath().c_str()) + fileName.toUtf8();
+                                (mCfgMgr.getLocalPath().string().c_str()) + fileName.toUtf8();
 
     //open user and global streams
     QTextStream *userStream = openFilestream (mUserFilePath, true);

apps/opencs/view/world/dialoguesubview.cpp

@@ -183,7 +183,7 @@ CSVWorld::CommandDelegate* CSVWorld::DialogueDelegateDispatcher::makeDelegate(CS
     {
         delegate = CommandDelegateFactoryCollection::get().makeDelegate (
                                     display, mUndoStack, mParent);
-        mDelegates.insert(std::make_pair<int, CommandDelegate*>(display, delegate));
+        mDelegates.insert(std::make_pair(display, delegate));
     } else
     {
         delegate = delegateIt->second;