Fix naming to clean API

SettingOpenTab --> NewTab (according to settings)
NewCurrentTab --> NewFocusedTab

11 files changed, 24 insertions, 24 deletions

diff --git a/src/application.cpp b/src/application.cpp
index 0fead4a6..a386eba4 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -136,7 +136,7 @@ int Application::newInstance()
             sessionManager()->restoreSession();
             kDebug() << "session restored following settings";
             if(areThereArguments)
-                loadUrl( KUrl("about:blank"), Rekonq::NewCurrentTab);
+                loadUrl( KUrl("about:blank"), Rekonq::NewFocusedTab);
         }
     }
     
@@ -158,7 +158,7 @@ int Application::newInstance()
             // Create a new one and load there sites...
             loadUrl(urlList.at(0), Rekonq::CurrentTab);
             for (int i = 1; i < urlList.count(); ++i)
-                loadUrl( urlList.at(i), Rekonq::SettingOpenTab);
+                loadUrl( urlList.at(i), Rekonq::NewTab);
         }
         else
         {
@@ -176,7 +176,7 @@ int Application::newInstance()
                 }
 
                 Q_FOREACH(const KUrl &u, urlList)
-                    loadUrl(u, Rekonq::NewCurrentTab);
+                    loadUrl(u, Rekonq::NewFocusedTab);
             }
         }    
     }
@@ -363,10 +363,10 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
 
     switch (type)
     {
-    case Rekonq::SettingOpenTab:
+    case Rekonq::NewTab:
         tab = w->mainView()->newWebTab(!ReKonfig::openTabsBack(), ReKonfig::openTabsNearCurrent());
         break;
-    case Rekonq::NewCurrentTab:
+    case Rekonq::NewFocusedTab:
         tab = w->mainView()->newWebTab(true);
         break;
     case Rekonq::NewBackTab:
diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp
index 4422763a..b5df463c 100644
--- a/src/bookmarks/bookmarkcontextmenu.cpp
+++ b/src/bookmarks/bookmarkcontextmenu.cpp
@@ -189,7 +189,7 @@ void BookmarkContextMenu::openInCurrentTab()
 
 void BookmarkContextMenu::openInNewTab()
 {
-    Application::instance()->loadUrl(bookmark().url(), Rekonq::SettingOpenTab);
+    Application::instance()->loadUrl(bookmark().url(), Rekonq::NewTab);
 }
 
 
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 4b4e127a..954a633a 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -66,7 +66,7 @@ void BookmarkOwner::openBookmark(const KBookmark & bookmark,
 {
     if (keyboardModifiers & Qt::ControlModifier || mouseButtons == Qt::MidButton)
     {
-        emit openUrl(bookmark.url(), Rekonq::SettingOpenTab);
+        emit openUrl(bookmark.url(), Rekonq::NewTab);
     }
     else
     {
@@ -112,7 +112,7 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark)
     QList<KUrl>::iterator url;
     for (url = urlList.begin(); url != urlList.end(); ++url)
     {
-        emit openUrl(*url, Rekonq::NewCurrentTab);
+        emit openUrl(*url, Rekonq::NewFocusedTab);
     }
 }
 
diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp
index a030676d..b9e7b10b 100644
--- a/src/history/historypanel.cpp
+++ b/src/history/historypanel.cpp
@@ -195,6 +195,6 @@ void HistoryPanel::openAll()
     }
 
     for (int i = 0; i < allChild.length(); i++)
-        emit openUrl(allChild.at(i).url(), Rekonq::SettingOpenTab);
+        emit openUrl(allChild.at(i).url(), Rekonq::NewTab);
 }
 
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 33eb88af..3974ef65 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -647,7 +647,7 @@ void MainView::openClosedTabs()
 {
     foreach (const HistoryItem &item, recentlyClosedTabs())
     {
-        Application::instance()->loadUrl( KUrl(item.url), Rekonq::SettingOpenTab);
+        Application::instance()->loadUrl( KUrl(item.url), Rekonq::NewTab);
     }
     m_recentlyClosedTabs.clear();
 }
@@ -657,7 +657,7 @@ void MainView::openClosedTab()
     KAction *action = qobject_cast<KAction *>(sender());
     if (action)
     {
-        Application::instance()->loadUrl(action->data().toUrl(), Rekonq::SettingOpenTab);
+        Application::instance()->loadUrl(action->data().toUrl(), Rekonq::NewTab);
         
         QString title = action->text();
         title = title.remove('&');
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3e7c13b0..6ea0446f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -956,7 +956,7 @@ void MainWindow::homePage(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers k
         : KUrl( ReKonfig::homePage() );
         
     if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
-        Application::instance()->loadUrl( homeUrl, Rekonq::SettingOpenTab);
+        Application::instance()->loadUrl( homeUrl, Rekonq::NewTab);
     else
         currentTab()->view()->load( homeUrl );
 }
@@ -1015,7 +1015,7 @@ void MainWindow::openPrevious(Qt::MouseButtons mouseButtons, Qt::KeyboardModifie
     
     if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
     {
-        Application::instance()->loadUrl(item->url(), Rekonq::SettingOpenTab);
+        Application::instance()->loadUrl(item->url(), Rekonq::NewTab);
     }
     else
     {
@@ -1049,7 +1049,7 @@ void MainWindow::openNext(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers k
     
     if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
     {
-        Application::instance()->loadUrl(item->url(), Rekonq::SettingOpenTab);
+        Application::instance()->loadUrl(item->url(), Rekonq::NewTab);
     }
     else
     {
diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp
index 58673d60..f935d8a2 100644
--- a/src/paneltreeview.cpp
+++ b/src/paneltreeview.cpp
@@ -101,7 +101,7 @@ void PanelTreeView::mouseReleaseEvent(QMouseEvent *event)
         return;
 
     if (event->button() == Qt::MidButton || event->modifiers() == Qt::ControlModifier)
-        validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
+        validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewTab);
 
     else if (event->button() == Qt::LeftButton)
     {
@@ -186,7 +186,7 @@ void PanelTreeView::openInNewTab()
     if (!index.isValid())
         return;
 
-    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::SettingOpenTab);
+    validOpenUrl(qVariantValue< KUrl >(index.data(Qt::UserRole)), Rekonq::NewTab);
 }
 
 
diff --git a/src/rekonq_defines.h b/src/rekonq_defines.h
index c8755e03..e8b2ab32 100644
--- a/src/rekonq_defines.h
+++ b/src/rekonq_defines.h
@@ -78,8 +78,8 @@ namespace Rekonq
     enum OpenType
     {
         CurrentTab,     ///< open url in current tab
-        SettingOpenTab, ///< open url according to users settings
-        NewCurrentTab,  ///< open url in new tab and make it current
+        NewTab,         ///< open url according to users settings
+        NewFocusedTab,  ///< open url in new tab and focus it
         NewBackTab,     ///< open url in new tab in background
         NewWindow       ///< open url in new window
     };
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index 56e24f16..8832878b 100644
--- a/src/sessionmanager.cpp
+++ b/src/sessionmanager.cpp
@@ -132,7 +132,7 @@ bool SessionManager::restoreSession()
             }
             else
             {
-                Application::instance()->loadUrl( KUrl(line), Rekonq::NewCurrentTab);
+                Application::instance()->loadUrl( KUrl(line), Rekonq::NewFocusedTab);
             }
         }
     }
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index a71e9611..1062681b 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -273,7 +273,7 @@ void CompletionWidget::setVisible(bool visible)
 void CompletionWidget::itemChosen(ListItem *item, Qt::MouseButton button, Qt::KeyboardModifiers modifier)
 {
     if (button == Qt::MidButton || modifier == Qt::ControlModifier)
-        emit chosenUrl(item->url(), Rekonq::NewCurrentTab);
+        emit chosenUrl(item->url(), Rekonq::NewFocusedTab);
     else
         emit chosenUrl(item->url(), Rekonq::CurrentTab);
     hide();
diff --git a/src/webview.cpp b/src/webview.cpp
index afa63028..f6c90bdd 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -396,7 +396,7 @@ void WebView::search()
     KService::Ptr engine = KService::serviceByDesktopPath(a->data().toString());
     KUrl urlSearch = KUrl(SearchEngine::buildQuery(engine, selectedText()));
 
-    emit loadUrl(urlSearch, Rekonq::NewCurrentTab);
+    emit loadUrl(urlSearch, Rekonq::NewFocusedTab);
 }
 
 
@@ -413,7 +413,7 @@ void WebView::viewImage(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifier
 
     if (modifiers & Qt::ControlModifier || buttons == Qt::MidButton)
     {
-        emit loadUrl(url, Rekonq::SettingOpenTab);
+        emit loadUrl(url, Rekonq::NewTab);
     }
     else
     {
@@ -436,7 +436,7 @@ void WebView::openLinkInNewTab()
     KAction *a = qobject_cast<KAction*>(sender());
     KUrl url(a->data().toUrl());
 
-    emit loadUrl(url, Rekonq::SettingOpenTab);
+    emit loadUrl(url, Rekonq::NewTab);
 }
 
 
@@ -552,7 +552,7 @@ void WebView::inspect()
 
 void WebView::loadUrlInNewTab(const KUrl &url)
 {
-    emit loadUrl(url, Rekonq::SettingOpenTab);
+    emit loadUrl(url, Rekonq::NewTab);
 }