From c17c484bf19429da9056bc3c975dc417341c3179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Mon, 22 Nov 2010 19:09:32 +0100 Subject: Revert "Make the invariants of MainView explicit" This reverts commit bf94b5e71b1a7cedf2f69bb3cd61661bc21c24c3. This commit introduced a bug that stoped the new tab button from working. --- src/mainview.cpp | 3 ++- src/mainview.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') 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 m_recentlyClosedTabs; - MainWindow *const m_parentWindow; + MainWindow *m_parentWindow; }; #endif // MAINVIEW_H -- cgit v1.2.1