Commit 06f8dff8 authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

[ #13801 ] Fix more pseudo warning

parent 24c90366
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
#include <QtGui/QFormLayout> #include <QtGui/QFormLayout>
#include <QtGui/QLabel> #include <QtGui/QLabel>
#include <QtGui/QRadioButton> #include <QtGui/QRadioButton>
#include <QtGui/QLineEdit>
#include <QtGui/QCheckBox> #include <QtGui/QCheckBox>
//KDE //KDE
#include <KLocale> #include <KLocale>
#include <KDebug> #include <KDebug>
#include <KLineEdit>
//SFLphone //SFLphone
#include "lib/sflphone_const.h" #include "lib/sflphone_const.h"
...@@ -93,7 +93,7 @@ int sendRequest(QString host, int port, QString req, QString & ret) ...@@ -93,7 +93,7 @@ int sendRequest(QString host, int port, QString req, QString & ret)
bzero(&servSockAddr, sizeof(servSockAddr)); bzero(&servSockAddr, sizeof(servSockAddr));
servHostEnt = gethostbyname(host.toLatin1()); servHostEnt = gethostbyname(host.toLatin1());
if (servHostEnt == NULL) { if (servHostEnt == nullptr) {
ret = "gethostbyname"; ret = "gethostbyname";
return -1; return -1;
} }
...@@ -107,7 +107,7 @@ int sendRequest(QString host, int port, QString req, QString & ret) ...@@ -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 ) { if(connect(s, (const struct sockaddr *) &servSockAddr, (socklen_t) sizeof(servSockAddr)) < 0 ) {
perror(NULL); perror(nullptr);
ret = "connect"; ret = "connect";
return -1; return -1;
} }
...@@ -224,7 +224,7 @@ void AccountWizard::accept() ...@@ -224,7 +224,7 @@ void AccountWizard::accept()
QString& zrtp_hello_hash = accountDetails[ QString( ACCOUNT_ZRTP_HELLO_HASH ) ]; QString& zrtp_hello_hash = accountDetails[ QString( ACCOUNT_ZRTP_HELLO_HASH ) ];
QString& display_sas_once = accountDetails[ QString( ACCOUNT_DISPLAY_SAS_ONCE ) ]; QString& display_sas_once = accountDetails[ QString( ACCOUNT_DISPLAY_SAS_ONCE ) ];
// interface paramters // interface parameters
QString& locale_interface = accountDetails[ QString(LOCAL_INTERFACE) ]; QString& locale_interface = accountDetails[ QString(LOCAL_INTERFACE) ];
QString& published_address = accountDetails[ QString(PUBLISHED_ADDRESS) ]; QString& published_address = accountDetails[ QString(PUBLISHED_ADDRESS) ];
...@@ -292,7 +292,7 @@ void AccountWizard::accept() ...@@ -292,7 +292,7 @@ void AccountWizard::accept()
} }
// common sip paramaters // common sip parameters
if(is_using_sip) { if(is_using_sip) {
if(field(FIELD_SIP_ENABLE_STUN).toBool()) { if(field(FIELD_SIP_ENABLE_STUN).toBool()) {
stun_enabled = QString(REGISTRATION_ENABLED_TRUE); stun_enabled = QString(REGISTRATION_ENABLED_TRUE);
...@@ -462,7 +462,7 @@ WizardAccountEmailAddressPage::WizardAccountEmailAddressPage(QWidget *parent) ...@@ -462,7 +462,7 @@ WizardAccountEmailAddressPage::WizardAccountEmailAddressPage(QWidget *parent)
setSubTitle(i18n( "This email address will be used to send your voicemail messages." )); setSubTitle(i18n( "This email address will be used to send your voicemail messages." ));
label_emailAddress = new QLabel ( i18n("Email address") ); label_emailAddress = new QLabel ( i18n("Email address") );
lineEdit_emailAddress = new QLineEdit ( ); lineEdit_emailAddress = new KLineEdit ( );
label_enableZrtp = new QLabel ( i18n("Secure with ZRTP") ); label_enableZrtp = new QLabel ( i18n("Secure with ZRTP") );
checkBox_enableZrtp = new QCheckBox ( ); checkBox_enableZrtp = new QCheckBox ( );
...@@ -512,14 +512,14 @@ WizardAccountSIPFormPage::WizardAccountSIPFormPage(QWidget *parent) ...@@ -512,14 +512,14 @@ WizardAccountSIPFormPage::WizardAccountSIPFormPage(QWidget *parent)
label_enableZrtp = new QLabel( i18n( "Secure with ZRTP" ) ); label_enableZrtp = new QLabel( i18n( "Secure with ZRTP" ) );
label_user = new QLabel( i18nc( "SIP Account Username","Username") + " *" ); label_user = new QLabel( i18nc( "SIP Account Username","Username") + " *" );
lineEdit_alias = new QLineEdit; lineEdit_alias = new KLineEdit;
lineEdit_server = new QLineEdit; lineEdit_server = new KLineEdit;
lineEdit_user = new QLineEdit; lineEdit_user = new KLineEdit;
lineEdit_password = new QLineEdit; lineEdit_password = new KLineEdit;
lineEdit_voicemail = new QLineEdit; lineEdit_voicemail = new KLineEdit;
checkBox_enableZrtp = new QCheckBox; 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_ALIAS) + '*' , lineEdit_alias );
registerField(QString( FIELD_SIP_SERVER) + '*' , lineEdit_server ); registerField(QString( FIELD_SIP_SERVER) + '*' , lineEdit_server );
...@@ -586,13 +586,13 @@ WizardAccountIAXFormPage::WizardAccountIAXFormPage(QWidget *parent) ...@@ -586,13 +586,13 @@ WizardAccountIAXFormPage::WizardAccountIAXFormPage(QWidget *parent)
label_voicemail = new QLabel(i18n("Voicemail number" )); label_voicemail = new QLabel(i18n("Voicemail number" ));
label_user = new QLabel(i18nc("SIP Account Username","Username") + " *" ); label_user = new QLabel(i18nc("SIP Account Username","Username") + " *" );
lineEdit_alias = new QLineEdit; lineEdit_alias = new KLineEdit;
lineEdit_server = new QLineEdit; lineEdit_server = new KLineEdit;
lineEdit_user = new QLineEdit; lineEdit_user = new KLineEdit;
lineEdit_password = new QLineEdit; lineEdit_password = new KLineEdit;
lineEdit_voicemail = new QLineEdit; 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_ALIAS ) + '*', lineEdit_alias );
registerField( QString( FIELD_IAX_SERVER ) + '*', lineEdit_server ); registerField( QString( FIELD_IAX_SERVER ) + '*', lineEdit_server );
...@@ -649,7 +649,7 @@ WizardAccountStunPage::WizardAccountStunPage(QWidget *parent) ...@@ -649,7 +649,7 @@ WizardAccountStunPage::WizardAccountStunPage(QWidget *parent)
checkBox_enableStun = new QCheckBox( i18n("Enable STUN") ); checkBox_enableStun = new QCheckBox( i18n("Enable STUN") );
label_StunServer = new QLabel ( i18n("Stun Server") ); label_StunServer = new QLabel ( i18n("Stun Server") );
lineEdit_StunServer = new QLineEdit( ); lineEdit_StunServer = new KLineEdit( );
lineEdit_StunServer->setDisabled(true); lineEdit_StunServer->setDisabled(true);
registerField(FIELD_SIP_ENABLE_STUN, checkBox_enableStun); registerField(FIELD_SIP_ENABLE_STUN, checkBox_enableStun);
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
//Qt //Qt
class QLabel; class QLabel;
class QRadioButton; class QRadioButton;
class QLineEdit; class KLineEdit;
class QCheckBox; class QCheckBox;
/** /**
...@@ -120,7 +120,7 @@ public: ...@@ -120,7 +120,7 @@ public:
private: private:
QLabel * label_emailAddress; QLabel * label_emailAddress;
QLineEdit * lineEdit_emailAddress; KLineEdit * lineEdit_emailAddress;
QLabel * label_enableZrtp; QLabel * label_enableZrtp;
QCheckBox * checkBox_enableZrtp; QCheckBox * checkBox_enableZrtp;
}; };
...@@ -150,11 +150,11 @@ private: ...@@ -150,11 +150,11 @@ private:
QLabel* label_voicemail ; QLabel* label_voicemail ;
QLabel* label_enableZrtp ; QLabel* label_enableZrtp ;
QLineEdit* lineEdit_alias ; KLineEdit* lineEdit_alias ;
QLineEdit* lineEdit_server ; KLineEdit* lineEdit_server ;
QLineEdit* lineEdit_user ; KLineEdit* lineEdit_user ;
QLineEdit* lineEdit_password ; KLineEdit* lineEdit_password ;
QLineEdit* lineEdit_voicemail ; KLineEdit* lineEdit_voicemail ;
QCheckBox* checkBox_enableZrtp; QCheckBox* checkBox_enableZrtp;
}; };
...@@ -182,11 +182,11 @@ private: ...@@ -182,11 +182,11 @@ private:
QLabel* label_password ; QLabel* label_password ;
QLabel* label_voicemail ; QLabel* label_voicemail ;
QLineEdit* lineEdit_alias ; KLineEdit* lineEdit_alias ;
QLineEdit* lineEdit_server ; KLineEdit* lineEdit_server ;
QLineEdit* lineEdit_user ; KLineEdit* lineEdit_user ;
QLineEdit* lineEdit_password ; KLineEdit* lineEdit_password ;
QLineEdit* lineEdit_voicemail; KLineEdit* lineEdit_voicemail;
}; };
/*************************************************************************** /***************************************************************************
...@@ -206,7 +206,7 @@ public: ...@@ -206,7 +206,7 @@ public:
private: private:
QCheckBox* checkBox_enableStun; QCheckBox* checkBox_enableStun;
QLabel* label_StunServer ; QLabel* label_StunServer ;
QLineEdit* lineEdit_StunServer; KLineEdit* lineEdit_StunServer;
}; };
/*************************************************************************** /***************************************************************************
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
///Constrctor ///Constrctor
ActionSetAccountFirst::ActionSetAccountFirst(Account* account, QObject *parent) 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); setCheckable(true);
this->account = account; this->account = account;
......
...@@ -239,7 +239,7 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent),m_pActiveOverlay(0),m_ ...@@ -239,7 +239,7 @@ CallView::CallView(QWidget* parent) : QTreeWidget(parent),m_pActiveOverlay(0),m_
} }
foreach(Call* active, SFLPhone::model()->getConferenceList()) { 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); addConference(active);
} }
...@@ -380,11 +380,11 @@ bool CallView::callToCall(QTreeWidgetItem *parent, int index, const QMimeData *d ...@@ -380,11 +380,11 @@ bool CallView::callToCall(QTreeWidgetItem *parent, int index, const QMimeData *d
} }
kDebug() << "Adding participant"; kDebug() << "Adding participant";
int state = SFLPhone::model()->getCall(call1)->getState(); 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); SFLPhone::model()->getCall(call1)->actionPerformed(CALL_ACTION_ACCEPT);
} }
state = SFLPhone::model()->getCall(call2)->getState(); 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()->getCall(call2)->actionPerformed(CALL_ACTION_ACCEPT);
} }
SFLPhone::model()->addParticipant(SFLPhone::model()->getCall(call1),SFLPhone::model()->getCall(call2)); SFLPhone::model()->addParticipant(SFLPhone::model()->getCall(call1),SFLPhone::model()->getCall(call2));
...@@ -428,7 +428,7 @@ bool CallView::phoneNumberToCall(QTreeWidgetItem *parent, int index, const QMime ...@@ -428,7 +428,7 @@ bool CallView::phoneNumberToCall(QTreeWidgetItem *parent, int index, const QMime
//Dropped on call //Dropped on call
call2->actionPerformed(CALL_ACTION_ACCEPT); call2->actionPerformed(CALL_ACTION_ACCEPT);
int state = SFLPhone::model()->getCall(parent)->getState(); 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()->getCall(parent)->actionPerformed(CALL_ACTION_ACCEPT);
} }
SFLPhone::model()->createConferenceFromCall(call2,SFLPhone::model()->getCall(parent)); SFLPhone::model()->createConferenceFromCall(call2,SFLPhone::model()->getCall(parent));
...@@ -451,7 +451,7 @@ bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData ...@@ -451,7 +451,7 @@ bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData
if (!QString(encodedContact).isEmpty()) { if (!QString(encodedContact).isEmpty()) {
Contact* contact = AkonadiBackend::getInstance()->getContactByUid(encodedContact); Contact* contact = AkonadiBackend::getInstance()->getContactByUid(encodedContact);
if (contact) { if (contact) {
Call* call2 = NULL; Call* call2 = nullptr;
if (!SFLPhone::app()->view()->selectCallPhoneNumber(&call2,contact)) if (!SFLPhone::app()->view()->selectCallPhoneNumber(&call2,contact))
return false; return false;
if (!parent) { if (!parent) {
...@@ -475,7 +475,7 @@ bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData ...@@ -475,7 +475,7 @@ bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData
call2->actionPerformed(CALL_ACTION_ACCEPT); call2->actionPerformed(CALL_ACTION_ACCEPT);
int state = SFLPhone::model()->getCall(parent)->getState(); 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()->getCall(parent)->actionPerformed(CALL_ACTION_ACCEPT);
} }
SFLPhone::model()->createConferenceFromCall(call2,SFLPhone::model()->getCall(parent)); SFLPhone::model()->createConferenceFromCall(call2,SFLPhone::model()->getCall(parent));
...@@ -515,7 +515,7 @@ QMimeData* CallView::mimeData( const QList<QTreeWidgetItem *> items) const ...@@ -515,7 +515,7 @@ QMimeData* CallView::mimeData( const QList<QTreeWidgetItem *> items) const
{ {
kDebug() << "A call is being dragged"; kDebug() << "A call is being dragged";
if (items.size() < 1) { if (items.size() < 1) {
return NULL; return nullptr;
} }
QMimeData *mimeData = new QMimeData(); QMimeData *mimeData = new QMimeData();
......
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
#include "SFLPhoneAccessibility.h" #include "SFLPhoneAccessibility.h"
#include "lib/VideoModel.h" #include "lib/VideoModel.h"
SFLPhone* SFLPhone::m_sApp = NULL; SFLPhone* SFLPhone::m_sApp = nullptr;
TreeWidgetCallModel* SFLPhone::m_pModel = NULL; TreeWidgetCallModel* SFLPhone::m_pModel = nullptr;
///Constructor ///Constructor
SFLPhone::SFLPhone(QWidget *parent) SFLPhone::SFLPhone(QWidget *parent)
...@@ -129,7 +129,7 @@ bool SFLPhone::initialize() ...@@ -129,7 +129,7 @@ bool SFLPhone::initialize()
ConfigurationSkeleton::self(); 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); // CallModel<CallTreeItem*,QTreeWidgetItem*>* histoModel = new CallModel<CallTreeItem*,QTreeWidgetItem*>(CallModel<CallTreeItem*,QTreeWidgetItem*>::History);
// histoModel->initHistory(); // histoModel->initHistory();
...@@ -512,9 +512,9 @@ void SFLPhone::on_m_pView_incomingCall(const Call* call) ...@@ -512,9 +512,9 @@ void SFLPhone::on_m_pView_incomingCall(const Call* call)
{ {
Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(call->getPeerPhoneNumber()); Contact* contact = AkonadiBackend::getInstance()->getContactByPhone(call->getPeerPhoneNumber());
if (contact && call) { 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 #ifdef ENABLE_VIDEO
......
...@@ -270,7 +270,7 @@ void SFLPhoneView::escape() ...@@ -270,7 +270,7 @@ void SFLPhoneView::escape()
kDebug() << "Escape when no item is selected. Doing nothing."; kDebug() << "Escape when no item is selected. Doing nothing.";
} }
else { 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); action(call, CALL_ACTION_TRANSFER);
} }
else { else {
...@@ -289,7 +289,7 @@ void SFLPhoneView::enter() ...@@ -289,7 +289,7 @@ void SFLPhoneView::enter()
} }
else { else {
int state = call->getState(); 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); action(call, CALL_ACTION_ACCEPT);
} }
else { else {
...@@ -452,7 +452,7 @@ void SFLPhoneView::updateWindowCallState() ...@@ -452,7 +452,7 @@ void SFLPhoneView::updateWindowCallState()
enabledActions [ SFLPhone::Record ] = false ; enabledActions [ SFLPhone::Record ] = false ;
m_pMessageBoxW->setVisible(false) ; m_pMessageBoxW->setVisible(false) ;
break; break;
case CALL_STATE_TRANSFER: case CALL_STATE_TRANSFERRED:
buttonIconFiles [ SFLPhone::Accept ] = ICON_EXEC_TRANSF ; buttonIconFiles [ SFLPhone::Accept ] = ICON_EXEC_TRANSF ;
actionTexts [ SFLPhone::Transfer ] = ACTION_LABEL_GIVE_UP_TRANSF ; actionTexts [ SFLPhone::Transfer ] = ACTION_LABEL_GIVE_UP_TRANSF ;
buttonIconFiles [ SFLPhone::Record ] = ICON_REC_DEL_ON ; buttonIconFiles [ SFLPhone::Record ] = ICON_REC_DEL_ON ;
...@@ -710,7 +710,7 @@ void SFLPhoneView::contextMenuEvent(QContextMenuEvent *event) ...@@ -710,7 +710,7 @@ void SFLPhoneView::contextMenuEvent(QContextMenuEvent *event)
menu.addAction ( callActions[ SFLPhone::Record ] ); menu.addAction ( callActions[ SFLPhone::Record ] );
menu.addSeparator(); menu.addSeparator();
QAction* action = new ActionSetAccountFirst(NULL, &menu); QAction* action = new ActionSetAccountFirst(nullptr, &menu);
action->setChecked(AccountList::getPriorAccoundId().isEmpty()); action->setChecked(AccountList::getPriorAccoundId().isEmpty());
connect(action, SIGNAL(setFirst(Account *)), this , SLOT(setAccountFirst(Account *))); connect(action, SIGNAL(setFirst(Account *)), this , SLOT(setAccountFirst(Account *)));
menu.addAction(action); menu.addAction(action);
...@@ -853,7 +853,7 @@ void SFLPhoneView::on1_error(MapStringString details) ...@@ -853,7 +853,7 @@ void SFLPhoneView::on1_error(MapStringString details)
kDebug() << "Signal : Daemon error : " << details; kDebug() << "Signal : Daemon error : " << details;
} }
///When a call is comming (dbus) ///When a call is coming (dbus)
void SFLPhoneView::on1_incomingCall(Call* call) void SFLPhoneView::on1_incomingCall(Call* call)
{ {
kDebug() << "Signal : Incoming Call ! ID = " << call->getCallId(); kDebug() << "Signal : Incoming Call ! ID = " << call->getCallId();
...@@ -867,7 +867,7 @@ void SFLPhoneView::on1_incomingCall(Call* call) ...@@ -867,7 +867,7 @@ void SFLPhoneView::on1_incomingCall(Call* call)
emit incomingCall(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) void SFLPhoneView::on1_voiceMailNotify(const QString &accountID, int count)
{ {
kDebug() << "Signal : VoiceMail Notify ! " << count << " new voice mails for account " << accountID; kDebug() << "Signal : VoiceMail Notify ! " << count << " new voice mails for account " << accountID;
......
...@@ -205,7 +205,7 @@ signals: ...@@ -205,7 +205,7 @@ signals:
void transferCheckStateChangeAsked ( bool transferCheckState ); void transferCheckStateChangeAsked ( bool transferCheckState );
///Record state has changed ///Record state has changed
void recordCheckStateChangeAsked ( bool recordCheckState ); void recordCheckStateChangeAsked ( bool recordCheckState );
///When a new call is comming ///When a new call is coming
void incomingCall(const Call * call); void incomingCall(const Call * call);
}; };
......
...@@ -102,7 +102,7 @@ public slots: ...@@ -102,7 +102,7 @@ public slots:
bool hasChanged(); bool hasChanged();
/** /**
* reloads the informations before showing it. * reloads the information before showing it.
*/ */
void reload(); void reload();
......
...@@ -28,21 +28,21 @@ DlgAddressBook::DlgAddressBook(QWidget *parent) ...@@ -28,21 +28,21 @@ DlgAddressBook::DlgAddressBook(QWidget *parent)
{ {
setupUi(this); setupUi(this);
m_pPhoneTypeList->addItem( m_mNumbertype["Work"] = new QListWidgetItem("Work" )); m_pPhoneTypeList->addItem( m_mNumbertype["Work"] = new QListWidgetItem("Work" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Home"] = new QListWidgetItem("Home" )); m_pPhoneTypeList->addItem( m_mNumbertype["Home"] = new QListWidgetItem("Home" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Messenger"] = new QListWidgetItem("Messenger" )); 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["Preferred number"] = new QListWidgetItem("Preferred number" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Voice"] = new QListWidgetItem("Voice" )); m_pPhoneTypeList->addItem( m_mNumbertype["Voice"] = new QListWidgetItem("Voice" ));
// m_pPhoneTypeList->addItem( m_mNumbertype["Fax"] = new QListWidgetItem("Fax" )); // m_pPhoneTypeList->addItem( m_mNumbertype["Fax"] = new QListWidgetItem("Fax" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Mobile"] = new QListWidgetItem("Mobile" )); m_pPhoneTypeList->addItem( m_mNumbertype["Mobile"] = new QListWidgetItem("Mobile" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Video"] = new QListWidgetItem("Video" )); m_pPhoneTypeList->addItem( m_mNumbertype["Video"] = new QListWidgetItem("Video" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Mailbox"] = new QListWidgetItem("Mailbox" )); m_pPhoneTypeList->addItem( m_mNumbertype["Mailbox"] = new QListWidgetItem("Mailbox" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Modem"] = new QListWidgetItem("Modem" )); m_pPhoneTypeList->addItem( m_mNumbertype["Modem"] = new QListWidgetItem("Modem" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Car"] = new QListWidgetItem("Car" )); m_pPhoneTypeList->addItem( m_mNumbertype["Car"] = new QListWidgetItem("Car" ));
m_pPhoneTypeList->addItem( m_mNumbertype["ISDN"] = new QListWidgetItem("ISDN" )); m_pPhoneTypeList->addItem( m_mNumbertype["ISDN"] = new QListWidgetItem("ISDN" ));
m_pPhoneTypeList->addItem( m_mNumbertype["PCS"] = new QListWidgetItem("PCS" )); m_pPhoneTypeList->addItem( m_mNumbertype["PCS"] = new QListWidgetItem("PCS" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Pager"] = new QListWidgetItem("Pager" )); m_pPhoneTypeList->addItem( m_mNumbertype["Pager"] = new QListWidgetItem("Pager" ));
m_pPhoneTypeList->addItem( m_mNumbertype["Other..."] = new QListWidgetItem("Other..." )); m_pPhoneTypeList->addItem( m_mNumbertype["Other..."] = new QListWidgetItem("Other..." ));
QStringList list = ConfigurationSkeleton::phoneTypeList(); QStringList list = ConfigurationSkeleton::phoneTypeList();
foreach(QListWidgetItem* i,m_mNumbertype) { foreach(QListWidgetItem* i,m_mNumbertype) {
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="kcfg_displayHistoryStatus"> <widget class="QCheckBox" name="kcfg_displayHistoryStatus">
<property name="text"> <property name="text">
<string>Display incomming, outgoing and missed for history items</string> <string>Display incoming, outgoing and missed for history items</string>
</property> </property>
</widget> </widget>
</item> </item>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <KDebug> #include <KDebug>
DlgVideo::DlgVideo(QWidget *parent) DlgVideo::DlgVideo(QWidget *parent)
: QWidget(parent),m_pDevice(NULL) : QWidget(parent),m_pDevice(nullptr)
{ {
setupUi(this); setupUi(this);
......
...@@ -79,7 +79,7 @@ AkonadiBackend::~AkonadiBackend() ...@@ -79,7 +79,7 @@ AkonadiBackend::~AkonadiBackend()
///Singleton ///Singleton
ContactBackend* AkonadiBackend::getInstance() ContactBackend* AkonadiBackend::getInstance()
{ {
if (m_pInstance == NULL) { if (m_pInstance == nullptr) {
m_pInstance = new AkonadiBackend(0); m_pInstance = new AkonadiBackend(0);
} }
return m_pInstance; return m_pInstance;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
//KDE //KDE
#include <KDebug> #include <KDebug>
ConfigurationSkeleton * ConfigurationSkeleton::instance = NULL; ConfigurationSkeleton * ConfigurationSkeleton::instance = nullptr;
///Constructor ///Constructor
ConfigurationSkeleton::ConfigurationSkeleton() ConfigurationSkeleton::ConfigurationSkeleton()
...@@ -45,12 +45,12 @@ ConfigurationSkeleton::~ConfigurationSkeleton() ...@@ -45,12 +45,12 @@ ConfigurationSkeleton::~ConfigurationSkeleton()
///Signleton ///Signleton
ConfigurationSkeleton * ConfigurationSkeleton::self() ConfigurationSkeleton * ConfigurationSkeleton::self()
{ {
if(instance == NULL)