Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
a67e1394
Commit
a67e1394
authored
Nov 04, 2009
by
dt
Browse files
Fix memory leak in welcome plugin and right hand side pane
parent
655b06b4
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/plugins/help/centralwidget.cpp
View file @
a67e1394
...
...
@@ -220,7 +220,7 @@ void CentralWidget::setSource(const QUrl &url)
qobject_cast
<
HelpViewer
*>
(
tabWidget
->
widget
(
lastTabPage
));
if
(
!
viewer
&&
!
lastViewer
)
{
viewer
=
new
HelpViewer
(
helpEngine
,
this
);
viewer
=
new
HelpViewer
(
helpEngine
,
this
,
this
);
viewer
->
installEventFilter
(
this
);
lastTabPage
=
tabWidget
->
addTab
(
viewer
,
QString
());
tabWidget
->
setCurrentIndex
(
lastTabPage
);
...
...
@@ -428,7 +428,7 @@ void CentralWidget::setGlobalActions(const QList<QAction*> &actions)
void
CentralWidget
::
setSourceInNewTab
(
const
QUrl
&
url
,
int
zoom
)
{
HelpViewer
*
viewer
=
new
HelpViewer
(
helpEngine
,
this
);
HelpViewer
*
viewer
=
new
HelpViewer
(
helpEngine
,
this
,
this
);
viewer
->
installEventFilter
(
this
);
viewer
->
setZoom
(
zoom
);
viewer
->
setSource
(
url
);
...
...
@@ -448,7 +448,7 @@ void CentralWidget::setSourceInNewTab(const QUrl &url, int zoom)
HelpViewer
*
CentralWidget
::
newEmptyTab
()
{
HelpViewer
*
viewer
=
new
HelpViewer
(
helpEngine
,
this
);
HelpViewer
*
viewer
=
new
HelpViewer
(
helpEngine
,
this
,
this
);
viewer
->
installEventFilter
(
this
);
viewer
->
setFocus
(
Qt
::
OtherFocusReason
);
#if defined(QT_NO_WEBKIT)
...
...
src/plugins/help/helpplugin.cpp
View file @
a67e1394
...
...
@@ -491,7 +491,7 @@ void HelpPlugin::createRightPaneSideBar()
addAutoReleasedObject
(
new
Core
::
BaseRightPaneWidget
(
m_rightPaneSideBar
));
rightPaneLayout
->
addWidget
(
w
);
m_helpViewerForSideBar
=
new
HelpViewer
(
m_helpEngine
,
0
);
m_helpViewerForSideBar
=
new
HelpViewer
(
m_helpEngine
,
0
,
m_rightPaneSideBar
);
Aggregation
::
Aggregate
*
agg
=
new
Aggregation
::
Aggregate
();
agg
->
add
(
m_helpViewerForSideBar
);
agg
->
add
(
new
HelpViewerFindSupport
(
m_helpViewerForSideBar
));
...
...
src/plugins/projectexplorer/projectexplorer.cpp
View file @
a67e1394
...
...
@@ -207,6 +207,7 @@ ProjectExplorerPlugin::ProjectExplorerPlugin()
ProjectExplorerPlugin
::~
ProjectExplorerPlugin
()
{
removeObject
(
d
->
m_welcomePlugin
);
delete
d
->
m_welcomePlugin
;
removeObject
(
this
);
delete
d
;
}
...
...
src/plugins/projectexplorer/projectwelcomepage.cpp
View file @
a67e1394
...
...
@@ -39,6 +39,11 @@ ProjectWelcomePage::ProjectWelcomePage()
}
ProjectWelcomePage
::~
ProjectWelcomePage
()
{
}
QWidget
*
ProjectWelcomePage
::
page
()
{
return
m_page
;
...
...
src/plugins/projectexplorer/projectwelcomepage.h
View file @
a67e1394
...
...
@@ -42,6 +42,7 @@ class ProjectWelcomePage : public Utils::IWelcomePage
Q_OBJECT
public:
ProjectWelcomePage
();
~
ProjectWelcomePage
();
QWidget
*
page
();
QString
title
()
const
{
return
tr
(
"Develop"
);
}
...
...
src/shared/help/helpviewer.cpp
View file @
a67e1394
...
...
@@ -230,14 +230,14 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *,
return
false
;
}
HelpViewer
::
HelpViewer
(
QHelpEngine
*
engine
,
Help
::
Internal
::
CentralWidget
*
parent
)
HelpViewer
::
HelpViewer
(
QHelpEngine
*
engine
,
Help
::
Internal
::
CentralWidget
*
central
,
QWidget
*
parent
)
:
QWebView
(
parent
)
,
helpEngine
(
engine
)
,
parentWidget
(
parent
)
,
parentWidget
(
central
)
,
multiTabsAllowed
(
true
)
,
loadFinished
(
false
)
{
setPage
(
new
HelpPage
(
parent
,
helpEngine
,
this
));
setPage
(
new
HelpPage
(
central
,
helpEngine
,
this
));
settings
()
->
setAttribute
(
QWebSettings
::
PluginsEnabled
,
false
);
settings
()
->
setAttribute
(
QWebSettings
::
JavaEnabled
,
false
);
...
...
@@ -245,7 +245,7 @@ HelpViewer::HelpViewer(QHelpEngine *engine, Help::Internal::CentralWidget *paren
QAction
*
action
=
pageAction
(
QWebPage
::
OpenLinkInNewWindow
);
action
->
setText
(
tr
(
"Open Link in New Tab"
));
if
(
!
parent
)
{
if
(
!
central
)
{
multiTabsAllowed
=
false
;
action
->
setVisible
(
false
);
}
...
...
src/shared/help/helpviewer.h
View file @
a67e1394
...
...
@@ -64,7 +64,7 @@ class HelpViewer : public QWebView
Q_OBJECT
public:
HelpViewer
(
QHelpEngine
*
helpEngine
,
Help
::
Internal
::
CentralWidget
*
parent
);
HelpViewer
(
QHelpEngine
*
helpEngine
,
Help
::
Internal
::
CentralWidget
*
central
,
QWidget
*
parent
);
void
setSource
(
const
QUrl
&
url
);
inline
QUrl
source
()
const
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment