summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Poulain <ikipou@gmail.com>2010-11-13 16:41:52 +0100
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-11-20 18:52:59 +0100
commitddf453cfbf79d0bceccc109d3f46ac66fb18b113 (patch)
treeed5ee8ed8a16bdee57642455794be3da2af61ddc
parentUpdate the name of WebTab attributes to follow the conventions (diff)
downloadrekonq-ddf453cfbf79d0bceccc109d3f46ac66fb18b113.tar.xz
Update the name of MainView attribute to follow the conventions
Reviewed by: Pierre Rossi Reviewed by: Andrea Diamantini
-rw-r--r--src/mainview.cpp20
-rw-r--r--src/mainview.h4
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp
index beaf4e21..8432607a 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -59,7 +59,7 @@
MainView::MainView(MainWindow *parent)
: KTabWidget(parent)
- , _widgetBar(new StackedUrlBar(this))
+ , m_widgetBar(new StackedUrlBar(this))
, m_addTabButton(0)
, m_currentTabIndex(0)
, m_parentWindow(parent)
@@ -87,7 +87,7 @@ MainView::MainView(MainWindow *parent)
connect(tabBar, SIGNAL(detachTab(int)), this, SLOT(detachTab(int)));
connect(tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
- connect(tabBar, SIGNAL(tabMoved(int, int)), _widgetBar, SLOT(moveBar(int, int)));
+ connect(tabBar, SIGNAL(tabMoved(int, int)), m_widgetBar, SLOT(moveBar(int, int)));
// current page index changing
connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
@@ -98,7 +98,7 @@ MainView::MainView(MainWindow *parent)
MainView::~MainView()
{
- delete _widgetBar;
+ delete m_widgetBar;
delete m_addTabButton;
}
@@ -171,7 +171,7 @@ TabBar *MainView::tabBar() const
UrlBar *MainView::urlBar() const
{
- return _widgetBar->urlBar(m_currentTabIndex);
+ return m_widgetBar->urlBar(m_currentTabIndex);
}
@@ -278,7 +278,7 @@ void MainView::currentChanged(int index)
this, SIGNAL(linkHovered(const QString&)));
emit currentTitle(tab->view()->title());
- _widgetBar->setCurrentIndex(index);
+ m_widgetBar->setCurrentIndex(index);
// clean up "status bar"
emit showStatusBarMessage(QString());
@@ -288,7 +288,7 @@ void MainView::currentChanged(int index)
// set focus to the current webview
if (tab->url().scheme() == QL1S("about"))
- _widgetBar->currentWidget()->setFocus();
+ m_widgetBar->currentWidget()->setFocus();
else
tab->view()->setFocus();
}
@@ -325,12 +325,12 @@ WebTab *MainView::newWebTab(bool focused)
if ( ReKonfig::openTabsNearCurrent() )
{
insertTab(currentIndex() + 1, tab, i18n("(Untitled)"));
- _widgetBar->insertWidget(currentIndex() + 1, tab->urlBar());
+ m_widgetBar->insertWidget(currentIndex() + 1, tab->urlBar());
}
else
{
addTab(tab, i18n("(Untitled)"));
- _widgetBar->addWidget(tab->urlBar());
+ m_widgetBar->addWidget(tab->urlBar());
}
updateTabBar();
@@ -495,8 +495,8 @@ void MainView::closeTab(int index, bool del)
removeTab(index);
updateTabBar(); // UI operation: do it ASAP!!
- _widgetBar->removeWidget( tabToClose->urlBar() );
- _widgetBar->setCurrentIndex(m_currentTabIndex);
+ m_widgetBar->removeWidget( tabToClose->urlBar() );
+ m_widgetBar->setCurrentIndex(m_currentTabIndex);
if (del)
{
diff --git a/src/mainview.h b/src/mainview.h
index 29162dd1..22a3a46e 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -68,7 +68,7 @@ public:
MainView(MainWindow *parent);
~MainView();
- inline StackedUrlBar *widgetBar() const { return _widgetBar; }
+ inline StackedUrlBar *widgetBar() const { return m_widgetBar; }
UrlBar *urlBar() const;
WebTab *webTab(int index) const;
@@ -177,7 +177,7 @@ private:
// --------------------------------------------------------------------------
- StackedUrlBar *_widgetBar;
+ StackedUrlBar *m_widgetBar;
QString m_loadingGitPath;