web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qbrowserlib::Executor as singleton; refs #167

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-11-12 08:57:37 +00:00
parent db352a329b
commit d191d8cc68
12 changed files with 129 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qbrowserlib/swisswebview.hxx
View File

@@ -38,16 +38,12 @@ namespace qbrowserlib {
public:
//! Default construction, creates new @ref SwissWebView
SwissWebView(QWidget *parent=0,
QNetworkAccessManager* net=0,
Executor* executor=0): QWebView(parent) {
QNetworkAccessManager* net=0): QWebView(parent) {
if (!net) net = (_fallbackNetworkAccessManager =
std::auto_ptr<QNetworkAccessManager>
(new QNetworkAccessManager)).get();
if (!executor) executor = (_fallbackExecutor =
std::auto_ptr<Executor>
(new Executor)).get();
//! @bugfix, gcc does not yet support constructor calling
x(new SwissWebPage(net, executor, this));
x(new SwissWebPage(net, this));
}
//! Construction with externally allocated @ref SwissWebPage
/*! SwissWebView takes ownership of SwissWebPage. */
@@ -76,7 +72,6 @@ namespace qbrowserlib {
private:
std::auto_ptr<QNetworkAccessManager> _fallbackNetworkAccessManager;
std::auto_ptr<Executor> _fallbackExecutor;
};
}