Skip to content
GitLab
Commit 06f8dff8 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

[ #13801 ] Fix more pseudo warning

parent 24c90366
Hide whitespace changes
Inline Side-by-side
kde/src/AccountWizard.cpp
View file @ 06f8dff8
......@@ -29,12 +29,12 @@
#include <QtGui/QFormLayout>
#include <QtGui/QLabel>
#include <QtGui/QRadioButton>
#include <QtGui/QLineEdit>
#include <QtGui/QCheckBox>
//KDE
#include <KLocale>
#include <KDebug>
#include <KLineEdit>
//SFLphone
#include "lib/sflphone_const.h"
......@@ -93,7 +93,7 @@ int sendRequest(QString host, int port, QString req, QString & ret)
bzero(&servSockAddr, sizeof(servSockAddr));
servHostEnt = gethostbyname(host.toLatin1());
if (servHostEnt == NULL) {
if (servHostEnt == nullptr) {
ret = "gethostbyname";
return -1;
}
......@@ -107,7 +107,7 @@ int sendRequest(QString host, int port, QString req, QString & ret)
}
if(connect(s, (const struct sockaddr *) &servSockAddr, (socklen_t) sizeof(servSockAddr)) < 0 ) {
perror(NULL);
perror(nullptr);
ret = "connect";
return -1;
}
......@@ -224,7 +224,7 @@ void AccountWizard::accept()
QString& zrtp_hello_hash = accountDetails[ QString( ACCOUNT_ZRTP_HELLO_HASH ) ];
QString& display_sas_once = accountDetails[ QString( ACCOUNT_DISPLAY_SAS_ONCE ) ];
// interface paramters
// interface parameters
QString& locale_interface = accountDetails[ QString(LOCAL_INTERFACE) ];
QString& published_address = accountDetails[ QString(PUBLISHED_ADDRESS) ];
......@@ -292,7 +292,7 @@ void AccountWizard::accept()
}
// common sip paramaters
// common sip parameters
if(is_using_sip) {
if(field(FIELD_SIP_ENABLE_STUN).toBool()) {
stun_enabled = QString(REGISTRATION_ENABLED_TRUE);
......@@ -462,7 +462,7 @@ WizardAccountEmailAddressPage::WizardAccountEmailAddressPage(QWidget *parent)
setSubTitle(i18n( "This email address will be used to send your voicemail messages." ));
label_emailAddress = new QLabel ( i18n("Email address") );
lineEdit_emailAddress = new QLineEdit ( );
lineEdit_emailAddress = new KLineEdit ( );
label_enableZrtp = new QLabel ( i18n("Secure with ZRTP") );
checkBox_enableZrtp = new QCheckBox ( );
......@@ -512,14 +512,14 @@ WizardAccountSIPFormPage::WizardAccountSIPFormPage(QWidget *parent)
label_enableZrtp = new QLabel( i18n( "Secure with ZRTP" ) );
label_user = new QLabel( i18nc( "SIP Account Username","Username") + " *" );
lineEdit_alias = new QLineEdit;
lineEdit_server = new QLineEdit;
lineEdit_user = new QLineEdit;
lineEdit_password = new QLineEdit;
lineEdit_voicemail = new QLineEdit;
lineEdit_alias = new KLineEdit;
lineEdit_server = new KLineEdit;
lineEdit_user = new KLineEdit;
lineEdit_password = new KLineEdit;
lineEdit_voicemail = new KLineEdit;
checkBox_enableZrtp = new QCheckBox;
lineEdit_password->setEchoMode(QLineEdit::Password);
lineEdit_password->setEchoMode(KLineEdit::Password);
registerField(QString( FIELD_SIP_ALIAS) + '*' , lineEdit_alias );
registerField(QString( FIELD_SIP_SERVER) + '*' , lineEdit_server );
......@@ -586,13 +586,13 @@ WizardAccountIAXFormPage::WizardAccountIAXFormPage(QWidget *parent)
label_voicemail = new QLabel(i18n("Voicemail number" ));
label_user = new QLabel(i18nc("SIP Account Username","Username") + " *" );
lineEdit_alias = new QLineEdit;
lineEdit_server = new QLineEdit;
lineEdit_user = new QLineEdit;
lineEdit_password = new QLineEdit;
lineEdit_voicemail = new QLineEdit;
lineEdit_alias = new KLineEdit;
lineEdit_server = new KLineEdit;
lineEdit_user = new KLineEdit;
lineEdit_password = new KLineEdit;
lineEdit_voicemail = new KLineEdit;
lineEdit_password->setEchoMode(QLineEdit::Password);
lineEdit_password->setEchoMode(KLineEdit::Password);
registerField( QString( FIELD_IAX_ALIAS ) + '*', lineEdit_alias );
registerField( QString( FIELD_IAX_SERVER ) + '*', lineEdit_server );
......@@ -649,7 +649,7 @@ WizardAccountStunPage::WizardAccountStunPage(QWidget *parent)
checkBox_enableStun = new QCheckBox( i18n("Enable STUN") );
label_StunServer = new QLabel ( i18n("Stun Server") );
lineEdit_StunServer = new QLineEdit( );
lineEdit_StunServer = new KLineEdit( );
lineEdit_StunServer->setDisabled(true);
registerField(FIELD_SIP_ENABLE_STUN, checkBox_enableStun);
......
kde/src/AccountWizard.h
View file @ 06f8dff8
......@@ -27,7 +27,7 @@
//Qt
class QLabel;
class QRadioButton;
class QLineEdit;
class KLineEdit;
class QCheckBox;
/**
......@@ -120,7 +120,7 @@ public:
private:
QLabel * label_emailAddress;
QLineEdit * lineEdit_emailAddress;
KLineEdit * lineEdit_emailAddress;
QLabel * label_enableZrtp;
QCheckBox * checkBox_enableZrtp;
};
......@@ -150,11 +150,11 @@ private:
QLabel* label_voicemail ;
QLabel* label_enableZrtp ;
QLineEdit* lineEdit_alias ;
QLineEdit* lineEdit_server ;
QLineEdit* lineEdit_user ;
QLineEdit* lineEdit_password ;
QLineEdit* lineEdit_voicemail ;
KLineEdit* lineEdit_alias ;
KLineEdit* lineEdit_server ;
KLineEdit* lineEdit_user ;
KLineEdit* lineEdit_password ;
KLineEdit* lineEdit_voicemail ;
QCheckBox* checkBox_enableZrtp;
};
......@@ -182,11 +182,11 @@ private:
QLabel* label_password ;
QLabel* label_voicemail ;
QLineEdit* lineEdit_alias ;
QLineEdit* lineEdit_server ;
QLineEdit* lineEdit_user ;
QLineEdit* lineEdit_password ;
QLineEdit* lineEdit_voicemail;
KLineEdit* lineEdit_alias ;
KLineEdit* lineEdit_server ;
KLineEdit* lineEdit_user ;
KLineEdit* lineEdit_password ;
KLineEdit* lineEdit_voicemail;
};
/***************************************************************************
......@@ -206,7 +206,7 @@ public:
private:
QCheckBox* checkBox_enableStun;
QLabel* label_StunServer ;
QLineEdit* lineEdit_StunServer;
KLineEdit* lineEdit_StunServer;
};
/***************************************************************************
......
kde/src/ActionSetAccountFirst.cpp
View file @ 06f8dff8
......@@ -27,7 +27,7 @@
///Constrctor
ActionSetAccountFirst::ActionSetAccountFirst(Account* account, QObject *parent)
: QAction((account == NULL) ? i18n("Default account") : account->getAlias(), parent)
: QAction((account == nullptr) ? i18n("Default account") : account->getAlias(), parent)
{
setCheckable(true);
this->account = account;
......
kde/src/CallView.cpp
View file @ 06f8dff8
......@@ -239,7 +239,7 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent),m_pActiveOverlay(0),m_
}
foreach(Call* active, SFLPhone::model()->getConferenceList()) {
if (qobject_cast<Call*>(active)) //As of May 2012, the deamon still produce fake conferences
if (qobject_cast<Call*>(active)) //As of May 2012, the daemon still produce fake conferences
addConference(active);
}
......@@ -380,11 +380,11 @@ bool CallView::callToCall(QTreeWidgetItem *parent, int index, const QMimeData *d
}
kDebug() << "Adding participant";
int state = SFLPhone::model()->getCall(call1)->getState();
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFER || state == CALL_STATE_TRANSF_HOLD) {
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFERRED || state == CALL_STATE_TRANSF_HOLD) {
SFLPhone::model()->getCall(call1)->actionPerformed(CALL_ACTION_ACCEPT);
}
state = SFLPhone::model()->getCall(call2)->getState();
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFER || state == CALL_STATE_TRANSF_HOLD) {
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFERRED || state == CALL_STATE_TRANSF_HOLD) {
SFLPhone::model()->getCall(call2)->actionPerformed(CALL_ACTION_ACCEPT);
}
SFLPhone::model()->addParticipant(SFLPhone::model()->getCall(call1),SFLPhone::model()->getCall(call2));
......@@ -428,7 +428,7 @@ bool CallView::phoneNumberToCall(QTreeWidgetItem *parent, int index, const QMime
//Dropped on call
call2->actionPerformed(CALL_ACTION_ACCEPT);
int state = SFLPhone::model()->getCall(parent)->getState();
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFER || state == CALL_STATE_TRANSF_HOLD) {
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFERRED || state == CALL_STATE_TRANSF_HOLD) {
SFLPhone::model()->getCall(parent)->actionPerformed(CALL_ACTION_ACCEPT);
}
SFLPhone::model()->createConferenceFromCall(call2,SFLPhone::model()->getCall(parent));
......@@ -451,7 +451,7 @@ bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData
if (!QString(encodedContact).isEmpty()) {
Contact* contact = AkonadiBackend::getInstance()->getContactByUid(encodedContact);
if (contact) {
Call* call2 = NULL;
Call* call2 = nullptr;
if (!SFLPhone::app()->view()->selectCallPhoneNumber(&call2,contact))
return false;
if (!parent) {
......@@ -475,7 +475,7 @@ bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData
call2->actionPerformed(CALL_ACTION_ACCEPT);
int state = SFLPhone::model()->getCall(parent)->getState();
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFER || state == CALL_STATE_TRANSF_HOLD) {
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFERRED || state == CALL_STATE_TRANSF_HOLD) {
SFLPhone::model()->getCall(parent)->actionPerformed(CALL_ACTION_ACCEPT);
}
SFLPhone::model()->createConferenceFromCall(call2,SFLPhone::model()->getCall(parent));
......@@ -515,7 +515,7 @@ QMimeData* CallView::mimeData( const QList<QTreeWidgetItem *> items) const
{
kDebug() << "A call is being dragged";
if (items.size() < 1) {
return NULL;
return nullptr;
}
QMimeData *mimeData = new QMimeData();
......
kde/src/SFLPhone.cpp
View file @ 06f8dff8
......@@ -61,8 +61,8 @@
#include "SFLPhoneAccessibility.h"
#include "lib/VideoModel.h"
SFLPhone* SFLPhone::m_sApp = NULL;
TreeWidgetCallModel* SFLPhone::m_pModel = NULL;
SFLPhone* SFLPhone::m_sApp = nullptr;
TreeWidgetCallModel* SFLPhone::m_pModel = nullptr;
///Constructor
SFLPhone::SFLPhone(QWidget *parent)
......@@ -129,7 +129,7 @@ bool SFLPhone::initialize()
ConfigurationSkeleton::self();
//Keep these template paramater or the static attribute wont be share between this and the call view, they need to be
//Keep these template parameter or the static attribute wont be share between this and the call view, they need to be
// CallModel<CallTreeItem*,QTreeWidgetItem*>* histoModel = new CallModel<CallTreeItem*,QTreeWidgetItem*>(CallModel<CallTreeItem*,QTreeWidgetItem*>::History);
// histoModel->initHistory();
......@@ -512,9 +512,9 @@ void SFLPhone::on_m_pView_incomingCall(const Call* call)
{
Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(call->getPeerPhoneNumber());
if (contact && call) {
KNotification::event(KNotification::Notification, i18n("New incomming call"), i18n("New call from: \n") + (call->getPeerName().isEmpty() ? call->getPeerPhoneNumber() : call->getPeerName()),((contact->getPhoto())?*contact->getPhoto():NULL));
KNotification::event(KNotification::Notification, i18n("New incoming call"), i18n("New call from: \n") + (call->getPeerName().isEmpty() ? call->getPeerPhoneNumber() : call->getPeerName()),((contact->getPhoto())?*contact->getPhoto():nullptr));
}
KNotification::event(KNotification::Notification, i18n("New incomming call"), i18n("New call from: \n") + (call->getPeerName().isEmpty() ? call->getPeerPhoneNumber() : call->getPeerName()));
KNotification::event(KNotification::Notification, i18n("New incoming call"), i18n("New call from: \n") + (call->getPeerName().isEmpty() ? call->getPeerPhoneNumber() : call->getPeerName()));
}
#ifdef ENABLE_VIDEO
......
kde/src/SFLPhoneView.cpp
View file @ 06f8dff8
......@@ -270,7 +270,7 @@ void SFLPhoneView::escape()
kDebug() << "Escape when no item is selected. Doing nothing.";
}
else {
if(call->getState() == CALL_STATE_TRANSFER || call->getState() == CALL_STATE_TRANSF_HOLD) {
if(call->getState() == CALL_STATE_TRANSFERRED || call->getState() == CALL_STATE_TRANSF_HOLD) {
action(call, CALL_ACTION_TRANSFER);
}
else {
......@@ -289,7 +289,7 @@ void SFLPhoneView::enter()
}
else {
int state = call->getState();
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFER || state == CALL_STATE_TRANSF_HOLD) {
if(state == CALL_STATE_INCOMING || state == CALL_STATE_DIALING || state == CALL_STATE_TRANSFERRED || state == CALL_STATE_TRANSF_HOLD) {
action(call, CALL_ACTION_ACCEPT);
}
else {
......@@ -452,7 +452,7 @@ void SFLPhoneView::updateWindowCallState()
enabledActions [ SFLPhone::Record ] = false ;
m_pMessageBoxW->setVisible(false) ;
break;
case CALL_STATE_TRANSFER:
case CALL_STATE_TRANSFERRED:
buttonIconFiles [ SFLPhone::Accept ] = ICON_EXEC_TRANSF ;
actionTexts [ SFLPhone::Transfer ] = ACTION_LABEL_GIVE_UP_TRANSF ;
buttonIconFiles [ SFLPhone::Record ] = ICON_REC_DEL_ON ;
......@@ -710,7 +710,7 @@ void SFLPhoneView::contextMenuEvent(QContextMenuEvent *event)
menu.addAction ( callActions[ SFLPhone::Record ] );
menu.addSeparator();
QAction* action = new ActionSetAccountFirst(NULL, &menu);
QAction* action = new ActionSetAccountFirst(nullptr, &menu);
action->setChecked(AccountList::getPriorAccoundId().isEmpty());
connect(action, SIGNAL(setFirst(Account *)), this , SLOT(setAccountFirst(Account *)));
menu.addAction(action);
......@@ -853,7 +853,7 @@ void SFLPhoneView::on1_error(MapStringString details)
kDebug() << "Signal : Daemon error : " << details;
}
///When a call is comming (dbus)
///When a call is coming (dbus)
void SFLPhoneView::on1_incomingCall(Call* call)
{
kDebug() << "Signal : Incoming Call ! ID = " << call->getCallId();
......@@ -867,7 +867,7 @@ void SFLPhoneView::on1_incomingCall(Call* call)
emit incomingCall(call);
}
///When a new voice mail is comming
///When a new voice mail is coming
void SFLPhoneView::on1_voiceMailNotify(const QString &accountID, int count)
{
kDebug() << "Signal : VoiceMail Notify ! " << count << " new voice mails for account " << accountID;
......
kde/src/SFLPhoneView.h
View file @ 06f8dff8
......@@ -205,7 +205,7 @@ signals:
void transferCheckStateChangeAsked ( bool transferCheckState );
///Record state has changed
void recordCheckStateChangeAsked ( bool recordCheckState );
///When a new call is comming
///When a new call is coming
void incomingCall(const Call * call);
};
......
kde/src/conf/ConfigurationDialog.h
View file @ 06f8dff8
......@@ -102,7 +102,7 @@ public slots:
bool hasChanged();
/**
* reloads the informations before showing it.
* reloads the information before showing it.
*/
void reload();
......
kde/src/conf/dlgaddressbook.cpp
View file @ 06f8dff8
......@@ -28,21 +28,21 @@ DlgAddressBook::DlgAddressBook(QWidget *parent)
{
setupUi(this);
m_pPhoneTypeList->addItem( m_mNumbertype["Work"] = new QListWidgetItem("Work" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Home"] = new QListWidgetItem("Home" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Messenger"] = new QListWidgetItem("Messenger" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Prefered number"] = new QListWidgetItem("Prefered number" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Voice"] = new QListWidgetItem("Voice" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Work"] = new QListWidgetItem("Work" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Home"] = new QListWidgetItem("Home" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Messenger"] = new QListWidgetItem("Messenger" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Preferred number"] = new QListWidgetItem("Preferred number" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Voice"] = new QListWidgetItem("Voice" ));
// m_pPhoneTypeList->addItem( m_mNumbertype["Fax"] = new QListWidgetItem("Fax" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Mobile"] = new QListWidgetItem("Mobile" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Video"] = new QListWidgetItem("Video" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Mailbox"] = new QListWidgetItem("Mailbox" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Modem"] = new QListWidgetItem("Modem" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Car"] = new QListWidgetItem("Car" ));
m_pPhoneTypeList->addItem( m_mNumbertype["ISDN"] = new QListWidgetItem("ISDN" ));
m_pPhoneTypeList->addItem( m_mNumbertype["PCS"] = new QListWidgetItem("PCS" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Pager"] = new QListWidgetItem("Pager" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Other..."] = new QListWidgetItem("Other..." ));
m_pPhoneTypeList->addItem( m_mNumbertype["Mobile"] = new QListWidgetItem("Mobile" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Video"] = new QListWidgetItem("Video" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Mailbox"] = new QListWidgetItem("Mailbox" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Modem"] = new QListWidgetItem("Modem" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Car"] = new QListWidgetItem("Car" ));
m_pPhoneTypeList->addItem( m_mNumbertype["ISDN"] = new QListWidgetItem("ISDN" ));
m_pPhoneTypeList->addItem( m_mNumbertype["PCS"] = new QListWidgetItem("PCS" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Pager"] = new QListWidgetItem("Pager" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Other..."] = new QListWidgetItem("Other..." ));
QStringList list = ConfigurationSkeleton::phoneTypeList();
foreach(QListWidgetItem* i,m_mNumbertype) {
......
kde/src/conf/dlggeneralbase.ui
View file @ 06f8dff8
......@@ -84,7 +84,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="kcfg_displayHistoryStatus">
<property name="text">
<string>Display incomming, outgoing and missed for history items</string>
<string>Display incoming, outgoing and missed for history items</string>
</property>
</widget>
</item>
......
kde/src/conf/dlgvideo.cpp
View file @ 06f8dff8
......@@ -24,7 +24,7 @@
#include <KDebug>
DlgVideo::DlgVideo(QWidget *parent)
: QWidget(parent),m_pDevice(NULL)
: QWidget(parent),m_pDevice(nullptr)
{
setupUi(this);
......
kde/src/klib/AkonadiBackend.cpp
View file @ 06f8dff8
......@@ -79,7 +79,7 @@ AkonadiBackend::~AkonadiBackend()
///Singleton
ContactBackend* AkonadiBackend::getInstance()
{
if (m_pInstance == NULL) {
if (m_pInstance == nullptr) {
m_pInstance = new AkonadiBackend(0);
}
return m_pInstance;
......
kde/src/klib/ConfigurationSkeleton.cpp
View file @ 06f8dff8
......@@ -26,7 +26,7 @@
//KDE
#include <KDebug>
ConfigurationSkeleton * ConfigurationSkeleton::instance = NULL;
ConfigurationSkeleton * ConfigurationSkeleton::instance = nullptr;
///Constructor
ConfigurationSkeleton::ConfigurationSkeleton()
......@@ -45,12 +45,12 @@ ConfigurationSkeleton::~ConfigurationSkeleton()
///Signleton
ConfigurationSkeleton * ConfigurationSkeleton::self()
{
if(instance == NULL)
if(instance == nullptr)
{ instance = new ConfigurationSkeleton(); }
return instance;
}
///Read the config and override some variable using deamon defaults
///Read the config and override some variable using daemon defaults
void ConfigurationSkeleton::readConfig()
{
//ConfigurationSkeleton::readConfig();
......
kde/src/klib/SortableDockCommon.hpp
View file @ 06f8dff8
......@@ -211,7 +211,7 @@ CALLMODEL_TEMPLATE void SORTABLE_T::setContactCategory(QList<Contact*> contacts,
}
} //setContactCategory
///Return the identity of the call caller, try to return something usefull
///Return the identity of the call caller, try to return something useful
CALLMODEL_TEMPLATE QString SORTABLE_T::getIdentity(Call* item)
{
Contact* contact = item->getContact();
......
kde/src/klib/dataengine/sflphonEngine.cpp
View file @ 06f8dff8
......@@ -42,7 +42,7 @@
#include "sflphoneService.h"
//Static
CallModel<>* SFLPhoneEngine::m_pModel = NULL;
CallModel<>* SFLPhoneEngine::m_pModel = nullptr;
/*****************************************************************************
......@@ -281,7 +281,7 @@ void SFLPhoneEngine::updateContacts()
setData("contacts", "fake",fake );
}
///Update other informations
///Update other information
void SFLPhoneEngine::updateInfo()
{
setData("info", I18N_NOOP("Current_account"), AccountList::getCurrentAccount()->getAccountId());
......@@ -340,14 +340,14 @@ void SFLPhoneEngine::callStateChangedSignal(Call* call)
updateCallList();
}
///When incomming call
///When incoming call
void SFLPhoneEngine::incomingCallSignal(Call* call)
{
Q_UNUSED(call)
updateCallList();
}
///When incomming messge
///When incoming messge
void SFLPhoneEngine::incomingMessageSignal(const QString& accountId, const QString& message)
{
Q_UNUSED(accountId)
......
kde/src/klib/dataengine/sflphoneService.cpp
View file @ 06f8dff8
......@@ -92,12 +92,12 @@ TransferJob::TransferJob(QObject* parent, const QString& operation, const QVaria
}
///Tranfer a call
///Transfer a call
void TransferJob::start()
{
Call* call = SFLPhoneEngine::getModel()->getCall(m_CallId);
call->setTransferNumber(m_transferNumber);
call->changeCurrentState(CALL_STATE_TRANSFER);
call->changeCurrentState(CALL_STATE_TRANSFERRED);
call->actionPerformed(CALL_ACTION_ACCEPT);
call->changeCurrentState(CALL_STATE_OVER);
}
......
kde/src/klib/sflphone-client-kde.kcfg
View file @ 06f8dff8
......@@ -55,7 +55,7 @@
<default> 48 </default>
</entry>
<entry name="displayHistoryStatus" type="Bool">
<label>Display incomming, outgoing or missed</label>
<label>Display incoming, outgoing or missed</label>
<default> true </default>
</entry>
......@@ -140,7 +140,7 @@
<entry name="phoneTypeList" type="StringList">
<label>Defines whether the search in KDE Address Book is enabled</label>
<default>{Work,Home,Messenger,Prefered number,Voice,Mobile,Work,Video,Mailbox,Modem,Car,ISDN,PCS,Pager,Other...,Work}</default>
<default>{Work,Home,Messenger,Preferred number,Voice,Mobile,Work,Video,Mailbox,Modem,Car,ISDN,PCS,Pager,Other...,Work}</default>
</entry>
<entry name="displayOrganisation" type="bool">
......
kde/src/lib/Account.cpp
View file @ 06f8dff8
......@@ -84,7 +84,7 @@ const QString& account_state_name(const QString& s)
} //account_state_name
///Constructors
Account::Account():m_pAccountId(NULL),m_pAccountDetails(NULL),m_pCredentials(nullptr),m_pAudioCodecs(nullptr),m_CurrentState(READY),
Account::Account():m_pAccountId(nullptr),m_pAccountDetails(nullptr),m_pCredentials(nullptr),m_pAudioCodecs(nullptr),m_CurrentState(READY),
m_pVideoCodecs(nullptr)
{
CallManagerInterface& callManager = CallManagerInterfaceSingleton::getInstance();
......@@ -148,7 +148,7 @@ void Account::accountChanged(QString accountId,QString state,int)
///IS this account new
bool Account::isNew() const
{
return (m_pAccountId == NULL);
return (m_pAccountId == nullptr);
}
///Get this account ID
......@@ -187,7 +187,7 @@ const QString& Account::getAccountDetail(const QString& param) const
return (*m_pAccountDetails)[param];
}
else if (m_pAccountDetails->count() > 0) {
qDebug() << "Account paramater \"" << param << "\" not found";
qDebug() << "Account parameter \"" << param << "\" not found";
return EMPTY_STRING;
}
else {
......@@ -373,7 +373,7 @@ void Account::save()
saveAudioCodecs();
}
///Synchronise with the daemon, this need to be done manually to prevent reloading the account while it is being edited
///sync with the daemon, this need to be done manually to prevent reloading the account while it is being edited
void Account::reload()
{
qDebug() << "Reloading" << getAccountId();
......
kde/src/lib/AccountList.cpp
View file @ 06f8dff8
......@@ -268,12 +268,12 @@ QString AccountList::getOrderedList() const
Account* AccountList::getAccountById(const QString & id) const
{
if(id.isEmpty())
return NULL;
return nullptr;
for (int i = 0; i < m_pAccounts->size(); ++i) {
if (!(*m_pAccounts)[i]->isNew() && (*m_pAccounts)[i]->getAccountId() == id)
return (*m_pAccounts)[i];
}
return NULL;
return nullptr;
}
///Get account with a specific state
......@@ -319,7 +319,7 @@ Account* AccountList::firstRegisteredAccount() const
<< ((current)?current->getAccountRegistrationStatus():"");
}
}
return NULL;
return nullptr;
}
///Get the account size
......
kde/src/lib/AudioCodecModel.h
View file @ 06f8dff8
......@@ -51,7 +51,7 @@ public:
bool moveDown(QModelIndex idx);
private:
///@struct AudioCodecData store audio codec informations
///@struct AudioCodecData store audio codec information
struct AudioCodecData {
int id ;
QString name ;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment