summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ander Peñalba <jonan88@gmail.com>2010-11-22 19:09:32 +0100
committerJon Ander Peñalba <jonan88@gmail.com>2010-11-22 19:09:32 +0100
commitc17c484bf19429da9056bc3c975dc417341c3179 (patch)
tree7f317af0d5acf81bf4f137cd3fead9b4c328835a
parentMerge branch 'master' of git.kde.org:rekonq (diff)
downloadrekonq-c17c484bf19429da9056bc3c975dc417341c3179.tar.xz
Revert "Make the invariants of MainView explicit"
This reverts commit bf94b5e71b1a7cedf2f69bb3cd61661bc21c24c3. This commit introduced a bug that stoped the new tab button from working.
-rw-r--r--src/mainview.cpp3
-rw-r--r--src/mainview.h6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 1efcb0e4..3e5a3adb 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -63,12 +63,13 @@ const QString loadingGifPath = KStandardDirs::locate("appdata" , "pics/loading.m
MainView::MainView(MainWindow *parent)
: KTabWidget(parent)
, m_widgetBar(new StackedUrlBar(this))
- , m_addTabButton(new QToolButton(this))
+ , m_addTabButton(0)
, m_currentTabIndex(0)
, m_parentWindow(parent)
{
// setting tabbar
TabBar *tabBar = new TabBar(this);
+ m_addTabButton = new QToolButton(this);
setTabBar(tabBar);
// set mouse tracking for tab previews
diff --git a/src/mainview.h b/src/mainview.h
index 3cb34886..c6babb77 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -178,16 +178,16 @@ private:
// --------------------------------------------------------------------------
- StackedUrlBar *const m_widgetBar;
+ StackedUrlBar *m_widgetBar;
// the new tab button
- QToolButton *const m_addTabButton;
+ QToolButton *m_addTabButton;
int m_currentTabIndex;
QList<HistoryItem> m_recentlyClosedTabs;
- MainWindow *const m_parentWindow;
+ MainWindow *m_parentWindow;
};
#endif // MAINVIEW_H