diff options
author | Sebastian Schmelzer | 2011-11-03 17:26:49 +0100 |
---|---|---|
committer | Sebastian Schmelzer | 2011-11-03 17:26:49 +0100 |
commit | b5de5a6207a861931dbedeec19f628a75e08cbb9 (patch) | |
tree | 27fd970a3db47b8b559bbd0d50711516812386a3 /src/Dialog.cpp | |
parent | update cmake stuff (diff) | |
download | emuchooser-b5de5a6207a861931dbedeec19f628a75e08cbb9.tar.gz emuchooser-b5de5a6207a861931dbedeec19f628a75e08cbb9.tar.xz emuchooser-b5de5a6207a861931dbedeec19f628a75e08cbb9.zip |
code formating
Diffstat (limited to 'src/Dialog.cpp')
-rw-r--r-- | src/Dialog.cpp | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/src/Dialog.cpp b/src/Dialog.cpp index bc6a5a3..afe34bd 100644 --- a/src/Dialog.cpp +++ b/src/Dialog.cpp @@ -15,18 +15,17 @@ #include <QtGui> #include <QSizeGrip> -//#include <QSettings> +#include <QSettings> #include <QRect> #include <QWebView> #include <VSession.h> -//#include "QChooserTreeView.h" -//#include "QWebViewCustom.h" #include "JavaScriptInterface.h" -#include "Dialog.h" #include "Globals.h" +#include "Dialog.h" + void Dialog::setTheme() { @@ -34,14 +33,9 @@ Dialog::setTheme() } void -Dialog::showSettingsPVS() +Dialog::addItems(const QList<Session *> entries) { - -} - -void -Dialog::addItems(const QList<Session *> entries) { - jsi->addItems(entries); + jsi->addItems(entries); } void @@ -78,9 +72,11 @@ Dialog::Dialog(QWidget *parent) : #endif #if QT_VERSION >= 0x040700 - QWebSettings::globalSettings()->setAttribute(QWebSettings::LocalContentCanAccessFileUrls, true); + QWebSettings::globalSettings()->setAttribute( + QWebSettings::LocalContentCanAccessFileUrls, true); #endif - QWebSettings::globalSettings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true); + QWebSettings::globalSettings()->setAttribute( + QWebSettings::LocalContentCanAccessRemoteUrls, true); //QWebSettings::globalSettings()->setAttribute(, true); webView->setUrl(QUrl("qrc:/html/index.html")); @@ -90,13 +86,8 @@ Dialog::Dialog(QWidget *parent) : setLayout(layout); jsi = new JavaScriptInterface(webView); - QObject::connect( - webView->page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), - jsi, SLOT(attachToDOM()) - ); - QObject::connect( - jsi, SIGNAL(hideMainWindow()), - this, SLOT(hide()) - ); + QObject::connect(webView->page()->mainFrame(), + SIGNAL(javaScriptWindowObjectCleared()), jsi, SLOT(attachToDOM())); + QObject::connect(jsi, SIGNAL(hideMainWindow()), this, SLOT(hide())); } |