Refactoring TabBar

- cleaned up code
- moved to mainwindow/widgets
- add Close tabs left/right to context menu

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/configuration/configuration.cpp b/lib/configuration/configuration.cpp
index fa01951..959dfc2 100644
--- a/lib/configuration/configuration.cpp
+++ b/lib/configuration/configuration.cpp
@@ -38,7 +38,6 @@ Configuration::Configuration()
 
         // browser menu
         ("browser.shortcuts.newWindow", po::value<std::string>()->default_value("Ctrl+N"))
-        ("browser.shortcuts.newTab", po::value<std::string>()->default_value("Ctrl+T"))
         ("browser.shortcuts.about", po::value<std::string>()->default_value("F1"))
         ("browser.shortcuts.quit", po::value<std::string>()->default_value("Ctrl+Q"))
 
@@ -54,10 +53,11 @@ Configuration::Configuration()
         ("addressbar.shortcuts.pageMenu", po::value<std::string>()->default_value("F2"))
         ("addressbar.shortcuts.toolsMenu", po::value<std::string>()->default_value("F10"))
 
-        // tabs
-        ("browser.shortcuts.tabClose", po::value<std::string>()->default_value("Ctrl+X"))
-        ("browser.shortcuts.tabLeft", po::value<std::string>()->default_value("Ctrl+O"))
-        ("browser.shortcuts.tabRight", po::value<std::string>()->default_value("Ctrl+P"))
+        // tab bar
+        ("tabbar.shortcuts.new", po::value<std::string>()->default_value("Ctrl+T"))
+        ("tabbar.shortcuts.close", po::value<std::string>()->default_value("Ctrl+X"))
+        ("tabbar.shortcuts.left", po::value<std::string>()->default_value("Ctrl+O"))
+        ("tabbar.shortcuts.right", po::value<std::string>()->default_value("Ctrl+P"))
 
         // page
         ("browser.shortcuts.toggleSearchBox", po::value<std::string>()->default_value("F3"))
@@ -131,7 +131,7 @@ bool Configuration::parse(int argc, const char **argv)
 QHash<QString, QString> Configuration::section(const std::string &prefix) const
 {
     QHash<QString, QString> v;
-    for(auto s : desc.options()) {
+    for(auto &s : desc.options()) {
         if(boost::starts_with(s->long_name(), prefix)) {
             v[s->long_name().c_str()] = QString::fromStdString(value<std::string>(s->long_name().c_str()).value());
         }