Commit b5f0bedf authored by Jan Möbius's avatar Jan Möbius

Improved VS 2012 compatibility (Thancs to Duncan Paterson for the patch)



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16732 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 70189665
......@@ -310,8 +310,8 @@ void CoreWidget::slotRegisterSlotKeyBindings(){
coreKeys_.push_back( kb );
keys_.insert( std::make_pair( std::make_pair(-1, 0) , std::make_pair ((QObject*)0, coreKeys_.size()-1 ) )) ;
invKeys_.insert( std::make_pair( std::make_pair ((QObject*)0, coreKeys_.size()-1 ) , std::make_pair(-1, 0) ) );
keys_.insert( std::make_pair( std::make_pair(-1, (QFlags<Qt::KeyboardModifier>)0) , std::make_pair ((QObject*)0, coreKeys_.size()-1 ) )) ;
invKeys_.insert( std::make_pair( std::make_pair ((QObject*)0, coreKeys_.size()-1 ) , std::make_pair(-1, (QFlags<Qt::KeyboardModifier>)0) ) );
}
//check all plugins
......@@ -333,8 +333,8 @@ void CoreWidget::slotRegisterSlotKeyBindings(){
plugins_[i].keys.append( kb );
keys_.insert( std::make_pair( std::make_pair(-1, 0) , std::make_pair(plugins_[i].plugin, plugins_[i].keys.size()-1) ) );
invKeys_.insert( std::make_pair( std::make_pair(plugins_[i].plugin, plugins_[i].keys.size()-1) , std::make_pair(-1, 0) ) );
keys_.insert( std::make_pair( std::make_pair(-1, (QFlags<Qt::KeyboardModifier>)0) , std::make_pair(plugins_[i].plugin, plugins_[i].keys.size()-1) ) );
invKeys_.insert( std::make_pair( std::make_pair(plugins_[i].plugin, plugins_[i].keys.size()-1) , std::make_pair(-1, (QFlags<Qt::KeyboardModifier>)0) ) );
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment