summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonatan Pålsson <jonatan.palsson@pelagicore.com>2014-02-20 15:23:19 +0100
committerJonatan Pålsson <jonatan.palsson@pelagicore.com>2014-02-20 15:23:19 +0100
commit5454f850f4e786ad7bf314072f65abf1f6de5ed7 (patch)
tree23cf64cf25131842f9f9f19a0177be9afa0cde3d
parent070840b7c89d70ef5097dccb888c8f9475fa0bea (diff)
downloadbrowser-poc-5454f850f4e786ad7bf314072f65abf1f6de5ed7.tar.gz
Cleaned up warnings
-rw-r--r--browser/browserpage.cpp6
-rw-r--r--browser/errorlogger.cpp2
-rw-r--r--browser/networkmanager.cpp1
-rw-r--r--browser/userinput.cpp5
-rw-r--r--common/browserdbus.cpp5
-rw-r--r--common/cachemanagerdbus.h2
6 files changed, 15 insertions, 6 deletions
diff --git a/browser/browserpage.cpp b/browser/browserpage.cpp
index 9196a64..a789231 100644
--- a/browser/browserpage.cpp
+++ b/browser/browserpage.cpp
@@ -20,6 +20,7 @@
void BrowserPage::javaScriptAlert(QWebFrame *frame, const QString &message)
{
+ Q_UNUSED(frame);
emit onAlertDialog(message);
QEventLoop loop;
qDebug() << "Alert dialog opened:" << message;
@@ -30,6 +31,7 @@ void BrowserPage::javaScriptAlert(QWebFrame *frame, const QString &message)
bool BrowserPage::javaScriptConfirm(QWebFrame *frame, const QString &message)
{
+ Q_UNUSED(frame);
emit onConfirmDialog(message);
QEventLoop loop;
qDebug() << "Confirm dialog opened:" << message;
@@ -37,16 +39,18 @@ bool BrowserPage::javaScriptConfirm(QWebFrame *frame, const QString &message)
connect (m_userInput, SIGNAL(doCloseConfirmDialog(bool)), &loop, SLOT(quit()));
loop.exec();
qDebug() << "Confirm dialog closed:" << m_confirm;
+ return m_confirm;
}
bool BrowserPage::javaScriptPrompt(QWebFrame *frame, const QString &msg, const QString &defaultValue, QString *result )
{
+ Q_UNUSED(frame);
emit onPromptDialog(msg, defaultValue);
QEventLoop loop;
qDebug() << "Confirm dialog opened (default:" << defaultValue << ")";
connect (m_userInput, SIGNAL(doClosePromptDialog(QString, bool)), this, SLOT(prompt(QString, bool)));
connect (m_userInput, SIGNAL(doClosePromptDialog(QString, bool)), &loop, SLOT(quit()));
loop.exec();
- result = &m_promptStr;
+ *result = m_promptStr;
qDebug() << "Confirm dialog closed:" << m_promptBool << m_promptStr;
return m_promptBool;
}
diff --git a/browser/errorlogger.cpp b/browser/errorlogger.cpp
index c83f010..e0c5e8e 100644
--- a/browser/errorlogger.cpp
+++ b/browser/errorlogger.cpp
@@ -49,7 +49,7 @@ conn::brw::ERROR_IDS errorlogger::getItems(qlonglong timeFrom,
for (int i = startIndex; i < m_errors->size(); i++) {
const conn::brw::ErrorItem e = m_errors->at(i);
if (timeFrom <= e.i64DateTime && timeTo >= e.i64DateTime) {
- if (items.size() < itemsCount){
+ if (items.size() < (int)itemsCount){
items.append(e);
}
else
diff --git a/browser/networkmanager.cpp b/browser/networkmanager.cpp
index 1754b38..39fea62 100644
--- a/browser/networkmanager.cpp
+++ b/browser/networkmanager.cpp
@@ -109,6 +109,7 @@ conn::brw::ERROR_IDS networkmanager::closeSslErrorDialog(conn::brw::DIALOG_RESUL
void networkmanager::onAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator)
{
conn::brw::AuthenticationData data;
+ data.strHost = reply->url().toString();
emit onAuthenticationDialog(data);
qDebug() << "Authentication required";
QEventLoop loop;
diff --git a/browser/userinput.cpp b/browser/userinput.cpp
index 9035912..da06fda 100644
--- a/browser/userinput.cpp
+++ b/browser/userinput.cpp
@@ -87,6 +87,7 @@ conn::brw::ERROR_IDS userinput::closePromptDialog(QString resultStr, conn::brw::
conn::brw::ERROR_IDS userinput::getPrevEnteredValues (const QString &a_strInputName, const QString &a_strInputValue, conn::brw::INPUT_ELEMENT_TYPE a_i32InputType, QStringList &a_oInputVariants)
{
+ Q_UNUSED(a_strInputValue);
for (int i = 0; i < m_inputHistory->size(); i++){
struct inputStruct s = m_inputHistory->at(0);
qDebug() << s.value;
@@ -100,4 +101,6 @@ conn::brw::ERROR_IDS userinput::getPrevEnteredValues (const QString &a_strInputN
}
conn::brw::ERROR_IDS userinput::selectOption(const conn::brw::SelectableOptionList &a_oOptionList)
-{}
+{
+ return conn::brw::EID_NOT_IMPLEMENTED;
+}
diff --git a/common/browserdbus.cpp b/common/browserdbus.cpp
index f604963..7d0c185 100644
--- a/common/browserdbus.cpp
+++ b/common/browserdbus.cpp
@@ -19,9 +19,10 @@
#include "../common/browserdefs.h"
BrowserDbus::BrowserDbus(QObject *parent) :
- QObject(parent), m_instanceId("1"), m_isconnected(false), bookmark(NULL),
+ QObject(parent), bookmark(NULL),
userinput(NULL), webpagewindow(NULL), actualtab(NULL),
- actualuserinput(NULL),browser(NULL), dbusservicename(NULL)
+ actualuserinput(NULL), networkmanager(NULL), browser(NULL),
+ m_instanceId("1"), m_isconnected(false), dbusservicename(NULL)
{
qDebug() << __PRETTY_FUNCTION__;
diff --git a/common/cachemanagerdbus.h b/common/cachemanagerdbus.h
index f9cf9fb..8bc1dc7 100644
--- a/common/cachemanagerdbus.h
+++ b/common/cachemanagerdbus.h
@@ -41,7 +41,7 @@ signals:
private:
QString m_instanceId;
bool m_isconnected;
- conn::brw::ICacheManager *m_cachemanager = NULL;
+ conn::brw::ICacheManager *m_cachemanager;
void registertypes();
};