projects
/
situare
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8e5693b
)
Cleaned debug prints
login_browser
author
Sami Rämö
<sami.ramo@ixonos.com>
Fri, 12 Nov 2010 13:14:29 +0000
(15:14 +0200)
committer
Sami Rämö
<sami.ramo@ixonos.com>
Fri, 12 Nov 2010 13:14:29 +0000
(15:14 +0200)
src/engine/contactmanagerprivate.cpp
patch
|
blob
|
history
src/engine/updatelocation.cpp
patch
|
blob
|
history
src/facebookservice/facebookauthentication.cpp
patch
|
blob
|
history
src/network/networkcookiejar.cpp
patch
|
blob
|
history
src/situareservice/situareservice.cpp
patch
|
blob
|
history
src/ui/mainwindow.cpp
patch
|
blob
|
history
src/ui/ossoabookdialog.cpp
patch
|
blob
|
history
diff --git
a/src/engine/contactmanagerprivate.cpp
b/src/engine/contactmanagerprivate.cpp
index
96ac732
..
1ec00eb
100644
(file)
--- a/
src/engine/contactmanagerprivate.cpp
+++ b/
src/engine/contactmanagerprivate.cpp
@@
-51,7
+51,7
@@
QString ContactManagerPrivate::contactGuid(const QString &facebookId) const
qDebug() << __PRETTY_FUNCTION__;
if (!m_manager) {
qDebug() << __PRETTY_FUNCTION__;
if (!m_manager) {
- qWarning() << "Manager is uninitialized";
+ qCritical() << "Manager is uninitialized";
return QString();
}
return QString();
}
@@
-63,7
+63,7
@@
void ContactManagerPrivate::requestContactGuids()
qDebug() << __PRETTY_FUNCTION__;
if (!m_manager) {
qDebug() << __PRETTY_FUNCTION__;
if (!m_manager) {
- qWarning() << "Manager is uninitialized";
+ qCritical() << "Manager is uninitialized";
return;
}
return;
}
diff --git
a/src/engine/updatelocation.cpp
b/src/engine/updatelocation.cpp
index
4997316
..
96a0472
100644
(file)
--- a/
src/engine/updatelocation.cpp
+++ b/
src/engine/updatelocation.cpp
@@
-33,7
+33,7
@@
UpdateLocation::UpdateLocation(QObject *parent) :
QObject(parent),
m_publish(false)
{
QObject(parent),
m_publish(false)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
m_message = settings.value(UNSENT_MESSAGE_SETTING).toString();
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
m_message = settings.value(UNSENT_MESSAGE_SETTING).toString();
@@
-42,7
+42,7
@@
UpdateLocation::UpdateLocation(QObject *parent) :
UpdateLocation::~UpdateLocation()
{
UpdateLocation::~UpdateLocation()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
@@
-57,7
+57,7
@@
UpdateLocation::~UpdateLocation()
void UpdateLocation::clear()
{
void UpdateLocation::clear()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
m_message.clear();
m_publish = false;
m_message.clear();
m_publish = false;
@@
-65,21
+65,21
@@
void UpdateLocation::clear()
QString UpdateLocation::message() const
{
QString UpdateLocation::message() const
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
return m_message;
}
void UpdateLocation::send()
{
return m_message;
}
void UpdateLocation::send()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
emit locationUpdate(m_message, m_publish);
}
void UpdateLocation::setMessage(const QString &message)
{
emit locationUpdate(m_message, m_publish);
}
void UpdateLocation::setMessage(const QString &message)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
if (message != m_message) {
m_message = message;
if (message != m_message) {
m_message = message;
@@
-89,14
+89,14
@@
void UpdateLocation::setMessage(const QString &message)
bool UpdateLocation::publish() const
{
bool UpdateLocation::publish() const
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
return m_publish;
}
void UpdateLocation::setPublish(bool publish)
{
return m_publish;
}
void UpdateLocation::setPublish(bool publish)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
if (publish != m_publish) {
m_publish = publish;
if (publish != m_publish) {
m_publish = publish;
diff --git
a/src/facebookservice/facebookauthentication.cpp
b/src/facebookservice/facebookauthentication.cpp
index
dce4aeb
..
863b9c5
100644
(file)
--- a/
src/facebookservice/facebookauthentication.cpp
+++ b/
src/facebookservice/facebookauthentication.cpp
@@
-59,7
+59,7
@@
FacebookAuthentication::FacebookAuthentication(MainWindow *mainWindow, QObject *
void FacebookAuthentication::browserDestroyed()
{
void FacebookAuthentication::browserDestroyed()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
m_mainWindow->toggleProgressIndicator(false);
m_browser = 0;
m_mainWindow->toggleProgressIndicator(false);
m_browser = 0;
@@
-68,7
+68,7
@@
void FacebookAuthentication::browserDestroyed()
void FacebookAuthentication::clearAccountInformation(bool clearUserInformation)
{
/// @todo Parameter not needed
void FacebookAuthentication::clearAccountInformation(bool clearUserInformation)
{
/// @todo Parameter not needed
- qWarning() << __PRETTY_FUNCTION__ << "clearUserInformation:" << clearUserInformation;
+ qDebug() << __PRETTY_FUNCTION__ << "clearUserInformation:" << clearUserInformation;
if (clearUserInformation) {
NetworkCookieJar::clearCookiesSetting();
if (clearUserInformation) {
NetworkCookieJar::clearCookiesSetting();
@@
-80,7
+80,7
@@
void FacebookAuthentication::clearAccountInformation(bool clearUserInformation)
void FacebookAuthentication::destroyLogin()
{
void FacebookAuthentication::destroyLogin()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
m_mainWindow->destroyLoginDialog();
m_browser->deleteLater();
m_mainWindow->destroyLoginDialog();
m_browser->deleteLater();
@@
-88,14
+88,14
@@
void FacebookAuthentication::destroyLogin()
bool FacebookAuthentication::isLoggedIn() const
{
bool FacebookAuthentication::isLoggedIn() const
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
return m_loggedIn;
}
void FacebookAuthentication::login()
{
return m_loggedIn;
}
void FacebookAuthentication::login()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
if (!m_browser) {
m_browser = new QWebView(m_mainWindow);
if (!m_browser) {
m_browser = new QWebView(m_mainWindow);
@@
-137,7
+137,7
@@
void FacebookAuthentication::login()
void FacebookAuthentication::logOut(bool clearUserInformation)
{
void FacebookAuthentication::logOut(bool clearUserInformation)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
clearAccountInformation(clearUserInformation);
m_loggedIn = false;
clearAccountInformation(clearUserInformation);
m_loggedIn = false;
@@
-146,7
+146,7
@@
void FacebookAuthentication::logOut(bool clearUserInformation)
void FacebookAuthentication::networkReplyHandler(QNetworkReply *reply)
{
void FacebookAuthentication::networkReplyHandler(QNetworkReply *reply)
{
- qWarning() <<__PRETTY_FUNCTION__;
+ qDebug() <<__PRETTY_FUNCTION__;
if ((reply->error() != QNetworkReply::NoError)
&& (reply->error() != QNetworkReply::OperationCanceledError)) {
if ((reply->error() != QNetworkReply::NoError)
&& (reply->error() != QNetworkReply::OperationCanceledError)) {
@@
-159,7
+159,7
@@
void FacebookAuthentication::networkReplyHandler(QNetworkReply *reply)
QString FacebookAuthentication::parseSession(const QUrl &url)
{
QString FacebookAuthentication::parseSession(const QUrl &url)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
const QString END("}");
const QString END("}");
@@
-176,7
+176,7
@@
QString FacebookAuthentication::parseSession(const QUrl &url)
void FacebookAuthentication::sslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{
void FacebookAuthentication::sslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
Q_UNUSED(errors);
reply->ignoreSslErrors();
Q_UNUSED(errors);
reply->ignoreSslErrors();
@@
-184,7
+184,7
@@
void FacebookAuthentication::sslErrors(QNetworkReply *reply, const QList<QSslErr
void FacebookAuthentication::urlChanged(const QUrl &url)
{
void FacebookAuthentication::urlChanged(const QUrl &url)
{
- qWarning() << __PRETTY_FUNCTION__ << url.toString();
+ qDebug() << __PRETTY_FUNCTION__ << url.toString();
const QString WALL_POST_PERMISSION = "publish_stream";
const QString WALL_POST_PERMISSION = "publish_stream";
@@
-223,7
+223,7
@@
void FacebookAuthentication::urlChanged(const QUrl &url)
} else if (urlString.startsWith(FB_LOGIN_SUCCESS_URL)) {
// login succeeded, permissions granted/declined
const QString session = parseSession(url);
} else if (urlString.startsWith(FB_LOGIN_SUCCESS_URL)) {
// login succeeded, permissions granted/declined
const QString session = parseSession(url);
- qWarning() << __PRETTY_FUNCTION__ << "login finished, parsed session:" << session;
+ qDebug() << __PRETTY_FUNCTION__ << "login finished, parsed session:" << session;
if (!session.isEmpty()) {
destroyLogin();
m_loggedIn = true;
if (!session.isEmpty()) {
destroyLogin();
m_loggedIn = true;
diff --git
a/src/network/networkcookiejar.cpp
b/src/network/networkcookiejar.cpp
index
3b57808
..
5b6d7b8
100644
(file)
--- a/
src/network/networkcookiejar.cpp
+++ b/
src/network/networkcookiejar.cpp
@@
-32,21
+32,21
@@
const QString COOKIES_SETTING = "cookies";
NetworkCookieJar::NetworkCookieJar(QObject *parent)
: QNetworkCookieJar(parent)
{
NetworkCookieJar::NetworkCookieJar(QObject *parent)
: QNetworkCookieJar(parent)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
loadCookies();
}
NetworkCookieJar::~NetworkCookieJar()
{
loadCookies();
}
NetworkCookieJar::~NetworkCookieJar()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
saveCookies();
}
void NetworkCookieJar::clearCookiesSetting()
{
saveCookies();
}
void NetworkCookieJar::clearCookiesSetting()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
settings.remove(COOKIES_SETTING);
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
settings.remove(COOKIES_SETTING);
@@
-54,7
+54,7
@@
void NetworkCookieJar::clearCookiesSetting()
void NetworkCookieJar::loadCookies()
{
void NetworkCookieJar::loadCookies()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
@@
-72,7
+72,7
@@
void NetworkCookieJar::loadCookies()
void NetworkCookieJar::saveCookies()
{
void NetworkCookieJar::saveCookies()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
QList<QNetworkCookie> cookieList = allCookies();
QStringList list;
QList<QNetworkCookie> cookieList = allCookies();
QStringList list;
diff --git
a/src/situareservice/situareservice.cpp
b/src/situareservice/situareservice.cpp
index
78f212e
..
aee9f8e
100644
(file)
--- a/
src/situareservice/situareservice.cpp
+++ b/
src/situareservice/situareservice.cpp
@@
-79,14
+79,14
@@
void SituareService::addProfileImages(const QList<QUrl> &imageUrlList)
void SituareService::appendAccessToken(QString &requestUrl)
{
void SituareService::appendAccessToken(QString &requestUrl)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
requestUrl.append(m_session);
}
void SituareService::buildRequest(const QString &script, const QHash<QString, QString> ¶meters)
{
requestUrl.append(m_session);
}
void SituareService::buildRequest(const QString &script, const QHash<QString, QString> ¶meters)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
const QString PARAMETER_KEY_API = "api";
const QString PARAMETER_VALUE_API = "2.0";
const QString PARAMETER_KEY_API = "api";
const QString PARAMETER_VALUE_API = "2.0";
@@
-408,7
+408,7
@@
void SituareService::reverseGeo(const GeoCoordinate &coordinates)
void SituareService::sendRequest(const QString &requestUrl)
{
void SituareService::sendRequest(const QString &requestUrl)
{
- qWarning() << __PRETTY_FUNCTION__ << "requestUrl" << requestUrl;
+ qDebug() << __PRETTY_FUNCTION__ << "requestUrl" << requestUrl;
// make and send the request
QNetworkRequest request;
// make and send the request
QNetworkRequest request;
@@
-420,7
+420,7
@@
void SituareService::sendRequest(const QString &requestUrl)
void SituareService::updateSession(const QString &session)
{
void SituareService::updateSession(const QString &session)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
m_session = session;
m_session = session;
diff --git
a/src/ui/mainwindow.cpp
b/src/ui/mainwindow.cpp
index
a8f58ed
..
8c93369
100644
(file)
--- a/
src/ui/mainwindow.cpp
+++ b/
src/ui/mainwindow.cpp
@@
-282,7
+282,7
@@
void MainWindow::buildLocationSearchPanel()
void MainWindow::buildLoginDialog(QWebView *browser)
{
void MainWindow::buildLoginDialog(QWebView *browser)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
if (!m_loginDialog) {
m_loginDialog = new QDialog(this);
if (!m_loginDialog) {
m_loginDialog = new QDialog(this);
@@
-521,7
+521,7
@@
void MainWindow::createMenus()
void MainWindow::destroyLoginDialog()
{
void MainWindow::destroyLoginDialog()
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
if (m_loginDialog) {
m_loginDialog->hide();
if (m_loginDialog) {
m_loginDialog->hide();
@@
-847,7
+847,7
@@
void MainWindow::showUpdateLocationDialog()
void MainWindow::sslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{
void MainWindow::sslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{
- qWarning() << __PRETTY_FUNCTION__;
+ qDebug() << __PRETTY_FUNCTION__;
Q_UNUSED(errors)
reply->ignoreSslErrors();
Q_UNUSED(errors)
reply->ignoreSslErrors();
diff --git
a/src/ui/ossoabookdialog.cpp
b/src/ui/ossoabookdialog.cpp
index
3c35c39
..
7c4a36a
100644
(file)
--- a/
src/ui/ossoabookdialog.cpp
+++ b/
src/ui/ossoabookdialog.cpp
@@
-33,7
+33,7
@@
OssoABookContact* OssoABookDialog::lookup(const QString& id)
aggregator = (OssoABookAggregator*) osso_abook_aggregator_get_default(&error);
if (error) {
aggregator = (OssoABookAggregator*) osso_abook_aggregator_get_default(&error);
if (error) {
- qWarning() << "error opening addressbook" << error->message;
+ qCritical() << "error opening addressbook" << error->message;
g_error_free (error);
return NULL;
}
g_error_free (error);
return NULL;
}