summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2012-04-10 17:21:41 +0200
committerJonathan Bauer2012-04-10 17:21:41 +0200
commit659d1d5e5ee9e2111e3b7c6f429ad5a506a89f37 (patch)
tree3106eedb21bc66b49de6b76e7d2f0a255220214e
parentfix for user dialog showing every time (diff)
downloadfbgui-659d1d5e5ee9e2111e3b7c6f429ad5a506a89f37.tar.gz
fbgui-659d1d5e5ee9e2111e3b7c6f429ad5a506a89f37.tar.xz
fbgui-659d1d5e5ee9e2111e3b7c6f429ad5a506a89f37.zip
foo
-rw-r--r--src/fbgui/agui.cpp2
-rw-r--r--src/fbgui/ndgui.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/fbgui/agui.cpp b/src/fbgui/agui.cpp
index 84c2322..30874e7 100644
--- a/src/fbgui/agui.cpp
+++ b/src/fbgui/agui.cpp
@@ -39,7 +39,7 @@ void agui::setupLayout() {
// setup layout of the gui: debug split or browser
_webView = new QWebView(this);
//_webView->setContextMenuPolicy(Qt::NoContextMenu); // if this does not work try Qt::CustomContextMenu
- _webView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
+ //_webView->page()->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
if (debugMode > -1) {
// split main window in browser & debug console
Console* debugConsole = new Console(this);
diff --git a/src/fbgui/ndgui.cpp b/src/fbgui/ndgui.cpp
index c74ae82..03e5254 100644
--- a/src/fbgui/ndgui.cpp
+++ b/src/fbgui/ndgui.cpp
@@ -31,7 +31,6 @@ ndgui::ndgui() :
*/
ndgui::~ndgui() {
delete _allowUserChoice;
- delete _tryAgain;
delete _networkDiscovery;
}
@@ -145,8 +144,7 @@ void ndgui::handleAllProcessesFinished(bool userChoice) {
} else {
LOG4CXX_DEBUG(ndLogger, " No usable interfaces found!: " << _networkDiscovery->getErrorStr());
LOG4CXX_DEBUG(ndLogger, " list is empty");
- _jsi->abortBoot("No usable interfaces found!"
- + _networkDiscovery->getErrorStr());
+ _jsi->abortBoot("No usable interfaces found!" + _networkDiscovery->getErrorStr());
}
}