diff options
| -rw-r--r-- | src/application.cpp | 6 | ||||
| -rw-r--r-- | src/application.h | 4 | ||||
| -rw-r--r-- | src/bookmarks.cpp | 2 | ||||
| -rw-r--r-- | src/webview.cpp | 2 | 
4 files changed, 7 insertions, 7 deletions
| diff --git a/src/application.cpp b/src/application.cpp index 60205772..a9797f3e 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -98,7 +98,7 @@ int Application::newInstance()      {          for (int i = 0; i < args->count(); ++i)          { -            loadUrl(args->arg(i), Rekonq::NewTab);  +            loadUrl(args->arg(i), Rekonq::NewCurrentTab);           }          args->clear();      } @@ -288,10 +288,10 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)      case Rekonq::SettingOpenTab:          webView = m_mainWindow->mainView()->newTab(!ReKonfig::openTabsBack());          break; -    case Rekonq::NewTab: +    case Rekonq::NewCurrentTab:          webView = m_mainWindow->mainView()->newTab(true);          break; -    case Rekonq::BackgroundTab: +    case Rekonq::NewBackTab:          webView = m_mainWindow->mainView()->newTab(false);          break;      case Rekonq::CurrentTab: diff --git a/src/application.h b/src/application.h index 615bfe6b..e5637c90 100644 --- a/src/application.h +++ b/src/application.h @@ -69,8 +69,8 @@ namespace Rekonq      {          CurrentTab,     ///< open url in current tab          SettingOpenTab, ///< open url according to users settings -        NewTab,         ///< open url in new tab and make it current -        BackgroundTab   ///< open url in new tab in background +        NewCurrentTab,  ///< open url in new tab and make it current +        NewBackTab      ///< open url in new tab in background      };  } diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp index 8797c7cd..1a42ca51 100644 --- a/src/bookmarks.cpp +++ b/src/bookmarks.cpp @@ -91,7 +91,7 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bm)      QList<KUrl>::iterator url;      for (url = urlList.begin(); url != urlList.end(); ++url)      { -        Application::instance()->loadUrl(*url, Rekonq::NewTab); +        Application::instance()->loadUrl(*url, Rekonq::NewCurrentTab);      }  } diff --git a/src/webview.cpp b/src/webview.cpp index 51874627..a4621dd0 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -327,5 +327,5 @@ void WebView::slotSearch()      KAction *a = qobject_cast<KAction*>(sender());      QString search = a->data().toString() + selectedText();      KUrl urlSearch = KUrl::fromEncoded(search.toUtf8()); -    Application::instance()->loadUrl(urlSearch, Rekonq::NewTab); +    Application::instance()->loadUrl(urlSearch, Rekonq::NewCurrentTab);  } | 
