From 2d8dc47eeee9e450e4ba4fa024afc4aa7653de0e Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
Date: Wed, 14 Dec 2011 11:52:33 -0500
Subject: [PATCH] [ #7876 ] qDebug -> kDebug (to be able to disable them using
KDE gui)
---
src/Account.cpp | 5 +----
src/Call.cpp | 4 +---
src/CallModel.hpp | 2 +-
src/Contact.cpp | 1 -
src/Contact.h | 26 +++++++++++---------------
5 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/Account.cpp b/src/Account.cpp
index 0f82149e..2bd6e0e9 100644
--- a/src/Account.cpp
+++ b/src/Account.cpp
@@ -167,14 +167,12 @@ const QString& Account::getAlias() const
///Is this account enabled
bool Account::isEnabled() const
{
- qDebug() << "isEnabled = " << getAccountDetail(ACCOUNT_ENABLED);
return (getAccountDetail(ACCOUNT_ENABLED) == ACCOUNT_ENABLED_TRUE);
}
///Is this account registered
bool Account::isRegistered() const
{
- qDebug() << "isRegistered = " << getAccountDetail(ACCOUNT_STATUS);
return (getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_REGISTERED);
}
@@ -200,7 +198,7 @@ void Account::setAccountDetail(const QString& param, const QString& val)
///Set the account id
void Account::setAccountId(const QString& id)
{
- qDebug() << "accountId = " << m_pAccountId;
+ qDebug() << "Setting accountId = " << m_pAccountId;
if (! isNew())
qDebug() << "Error : setting AccountId of an existing account.";
m_pAccountId = new QString(id);
@@ -221,7 +219,6 @@ void Account::setEnabled(bool checked)
///Update the account
void Account::updateState()
{
- qDebug() << "updateState";
if(! isNew()) {
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
MapStringString details = configurationManager.getAccountDetails(getAccountId()).value();
diff --git a/src/Call.cpp b/src/Call.cpp
index 4d8b0b6d..d049db8b 100644
--- a/src/Call.cpp
+++ b/src/Call.cpp
@@ -176,8 +176,6 @@ Call* Call::buildIncomingCall(const QString & callId)
CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
MapStringString details = callManager.getCallDetails(callId).value();
- qDebug() << "details = " << details;
-
QString from = details[ CALL_PEER_NUMBER ];
QString account = details[ CALL_ACCOUNTID ];
QString peerName = details[ CALL_PEER_NAME ];
@@ -607,7 +605,7 @@ void Call::call()
CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
qDebug() << "account = " << m_Account;
if(m_Account.isEmpty()) {
- qDebug() << "account is not set, taking the first registered.";
+ qDebug() << "Account is not set, taking the first registered.";
this->m_Account = CallModelConvenience::getCurrentAccountId();
}
if(!m_Account.isEmpty()) {
diff --git a/src/CallModel.hpp b/src/CallModel.hpp
index c138ea26..11e51f83 100644
--- a/src/CallModel.hpp
+++ b/src/CallModel.hpp
@@ -341,7 +341,7 @@ template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::
///Executed when the daemon signal a modification in an existing conference. Update the call list and update the TreeView
template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::changeConference(const QString& confId, const QString& state)
{
- qDebug() << "Conf changed2";
+ qDebug() << "Conf changed";
Q_UNUSED(state)
if (!m_sPrivateCallList_callId[confId]) {
diff --git a/src/Contact.cpp b/src/Contact.cpp
index 557cf07a..3f4069c8 100644
--- a/src/Contact.cpp
+++ b/src/Contact.cpp
@@ -23,7 +23,6 @@
#include "Contact.h"
//Qt
-#include <QtCore/QDebug>
#include <QtGui/QPixmap>
//SFLPhone library
diff --git a/src/Contact.h b/src/Contact.h
index 87fa55c9..169ddf0b 100644
--- a/src/Contact.h
+++ b/src/Contact.h
@@ -37,11 +37,7 @@ namespace KABC {
#include "typedefs.h"
-/**
- * @class Contact Abstract version of a contact
- @author Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>
- @author Emmanuel Lepage <emmanuel.lepage@savoirfairelinux.com>
-*/
+///@class Contact Abstract version of a contact
class LIB_EXPORT Contact : public QObject{
Q_OBJECT
public:
@@ -83,16 +79,16 @@ public:
virtual void initItem();
//Getters
- virtual PhoneNumbers getPhoneNumbers() const;
- virtual const QString& getNickName() const;
- virtual const QString& getFirstName() const;
- virtual const QString& getSecondName() const;
- virtual const QString& getFormattedName() const;
- virtual const QString& getOrganization() const;
- virtual const QString& getUid() const;
- virtual const QString& getPreferredEmail() const;
- virtual const QPixmap* getPhoto() const;
- virtual const QString& getType() const;
+ virtual PhoneNumbers getPhoneNumbers() const;
+ virtual const QString& getNickName() const;
+ virtual const QString& getFirstName() const;
+ virtual const QString& getSecondName() const;
+ virtual const QString& getFormattedName() const;
+ virtual const QString& getOrganization() const;
+ virtual const QString& getUid() const;
+ virtual const QString& getPreferredEmail() const;
+ virtual const QPixmap* getPhoto() const;
+ virtual const QString& getType() const;
//Setters
virtual void setPhoneNumbers (PhoneNumbers );
--
GitLab