diff --git a/kde/src/AccountWizard.cpp b/kde/src/AccountWizard.cpp
index ea28aab3177d51687767440ef57db445fef5cb1c..b8807f873f9fb61f7bbbc7df9422c55c30fadb3d 100755
--- a/kde/src/AccountWizard.cpp
+++ b/kde/src/AccountWizard.cpp
@@ -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);
diff --git a/kde/src/AccountWizard.h b/kde/src/AccountWizard.h
index fddf116b1c581e63a9b33be8ff7ab43e5934d11d..06ef12e771b900186545d35535eb30bcb7ed7f79 100755
--- a/kde/src/AccountWizard.h
+++ b/kde/src/AccountWizard.h
@@ -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;
};
/***************************************************************************
diff --git a/kde/src/ActionSetAccountFirst.cpp b/kde/src/ActionSetAccountFirst.cpp
index 7138b801a5227fb7ffa10524228cd08671043328..29a8fdb4801dc76cefc7e52d7096260c8ec0bb1b 100755
--- a/kde/src/ActionSetAccountFirst.cpp
+++ b/kde/src/ActionSetAccountFirst.cpp
@@ -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;
diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp
index daf36ddf8869c09608f8a20c57b88fa72470a2d0..0a47496284f230f4a3f4859c87b9b26beb5d8b0a 100644
--- a/kde/src/CallView.cpp
+++ b/kde/src/CallView.cpp
@@ -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();
diff --git a/kde/src/SFLPhone.cpp b/kde/src/SFLPhone.cpp
index afbf3bb3bf2f2309a1198e5333ea46210d1ae475..8d5c5114641d0b4aa2abc43906ba69a1cd70822d 100755
--- a/kde/src/SFLPhone.cpp
+++ b/kde/src/SFLPhone.cpp
@@ -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
diff --git a/kde/src/SFLPhoneView.cpp b/kde/src/SFLPhoneView.cpp
index d7b70a5546f8123f86317896a47c54651ad52aa6..6f5ccdcfa458a8c7c1b483acab3686de334c4ae0 100755
--- a/kde/src/SFLPhoneView.cpp
+++ b/kde/src/SFLPhoneView.cpp
@@ -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;
diff --git a/kde/src/SFLPhoneView.h b/kde/src/SFLPhoneView.h
index 880efb27f8f9cdf896dfd19397874f00980f2177..961af3d628501a4890720a29f8a5057d1d384cd1 100755
--- a/kde/src/SFLPhoneView.h
+++ b/kde/src/SFLPhoneView.h
@@ -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);
};
diff --git a/kde/src/conf/ConfigurationDialog.h b/kde/src/conf/ConfigurationDialog.h
index 964e5e19606ebbe9dc6aef22324b0ca2b684c6ad..4f882477eff3a139c3979a46d6a47dfa3a217d6a 100755
--- a/kde/src/conf/ConfigurationDialog.h
+++ b/kde/src/conf/ConfigurationDialog.h
@@ -102,7 +102,7 @@ public slots:
bool hasChanged();
/**
- * reloads the informations before showing it.
+ * reloads the information before showing it.
*/
void reload();
diff --git a/kde/src/conf/dlgaddressbook.cpp b/kde/src/conf/dlgaddressbook.cpp
index a337eddf69e3325018740c3cfab28b115c3be3ee..ef7f81994ed02a894c49adb9984966532d167a17 100755
--- a/kde/src/conf/dlgaddressbook.cpp
+++ b/kde/src/conf/dlgaddressbook.cpp
@@ -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) {
diff --git a/kde/src/conf/dlggeneralbase.ui b/kde/src/conf/dlggeneralbase.ui
index 6f41bb3bfeb8d7d007fef10d352bc86ab9732562..ff3dc4c3cafcd5e7261998342e28d290dd761620 100755
--- a/kde/src/conf/dlggeneralbase.ui
+++ b/kde/src/conf/dlggeneralbase.ui
@@ -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>
diff --git a/kde/src/conf/dlgvideo.cpp b/kde/src/conf/dlgvideo.cpp
index f808d9383f547e3b74f82d1b51bf24a4e4cbe2e9..eaae07ad4015999f68a5cfb41c19ada285236f40 100644
--- a/kde/src/conf/dlgvideo.cpp
+++ b/kde/src/conf/dlgvideo.cpp
@@ -24,7 +24,7 @@
#include <KDebug>
DlgVideo::DlgVideo(QWidget *parent)
- : QWidget(parent),m_pDevice(NULL)
+ : QWidget(parent),m_pDevice(nullptr)
{
setupUi(this);
diff --git a/kde/src/klib/AkonadiBackend.cpp b/kde/src/klib/AkonadiBackend.cpp
index 72c8f0372b74622b45fd9e4a3ab769c658f16743..d69f6894bf588773d0b7bd7c57a1a7d0c9f58c6a 100644
--- a/kde/src/klib/AkonadiBackend.cpp
+++ b/kde/src/klib/AkonadiBackend.cpp
@@ -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;
diff --git a/kde/src/klib/ConfigurationSkeleton.cpp b/kde/src/klib/ConfigurationSkeleton.cpp
index 03c7d6869ff71c53fca272e7bd34b5728c555523..774a88a98b23edc45db4d38e2271e38c41b41e46 100755
--- a/kde/src/klib/ConfigurationSkeleton.cpp
+++ b/kde/src/klib/ConfigurationSkeleton.cpp
@@ -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();
diff --git a/kde/src/klib/SortableDockCommon.hpp b/kde/src/klib/SortableDockCommon.hpp
index 22409fb01b668ac17c96f19dab206cb7986e0958..6640e0f307e06c26c9e158644204d95f2062c013 100644
--- a/kde/src/klib/SortableDockCommon.hpp
+++ b/kde/src/klib/SortableDockCommon.hpp
@@ -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();
diff --git a/kde/src/klib/dataengine/sflphonEngine.cpp b/kde/src/klib/dataengine/sflphonEngine.cpp
index 3147f769856244648e97b41811c0e53b4a56afde..4f74a9cf359cc38b2b1cddf9c41f5165b0aefe03 100644
--- a/kde/src/klib/dataengine/sflphonEngine.cpp
+++ b/kde/src/klib/dataengine/sflphonEngine.cpp
@@ -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)
diff --git a/kde/src/klib/dataengine/sflphoneService.cpp b/kde/src/klib/dataengine/sflphoneService.cpp
index b4ae9b88de8b680451236ff7ee44973416bcde23..024d35ec7fdaf610064af35427cb2a7eae0b6dc6 100644
--- a/kde/src/klib/dataengine/sflphoneService.cpp
+++ b/kde/src/klib/dataengine/sflphoneService.cpp
@@ -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);
}
diff --git a/kde/src/klib/sflphone-client-kde.kcfg b/kde/src/klib/sflphone-client-kde.kcfg
index 95ab7ea7c1543e20b6460b93c48ed4dcb8f8c18c..b87df0d429e2e3fb71932beea212cdcf47d17710 100755
--- a/kde/src/klib/sflphone-client-kde.kcfg
+++ b/kde/src/klib/sflphone-client-kde.kcfg
@@ -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">
diff --git a/kde/src/lib/Account.cpp b/kde/src/lib/Account.cpp
index ac2b36cecde90497f36ccfffe21ec689a979b0df..005c4694a11cc56170980ee9aae7ba31648e559e 100644
--- a/kde/src/lib/Account.cpp
+++ b/kde/src/lib/Account.cpp
@@ -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();
diff --git a/kde/src/lib/AccountList.cpp b/kde/src/lib/AccountList.cpp
index 0aeb5edcc3958841af92ae8b1699985bc78d6018..6eee3b3cf814823d469e92b8b2abe328e351dbca 100644
--- a/kde/src/lib/AccountList.cpp
+++ b/kde/src/lib/AccountList.cpp
@@ -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
diff --git a/kde/src/lib/AudioCodecModel.h b/kde/src/lib/AudioCodecModel.h
index 3321f6330bc37402cd087fe716319f66ee761985..52f753717ddcfc5eeec7932044d592fc32f2b809 100644
--- a/kde/src/lib/AudioCodecModel.h
+++ b/kde/src/lib/AudioCodecModel.h
@@ -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 ;
diff --git a/kde/src/lib/Call.cpp b/kde/src/lib/Call.cpp
index e2734e8cd8a1dff8fc4284c5dc1d6fe33bc3d9e6..c2f7dce2e468d48d0dc59c812f8e879b2619ae4c 100644
--- a/kde/src/lib/Call.cpp
+++ b/kde/src/lib/Call.cpp
@@ -37,16 +37,16 @@ const call_state Call::actionPerformedStateMap [13][5] =
// ACCEPT REFUSE TRANSFER HOLD RECORD /**/
/*INCOMING */ {CALL_STATE_INCOMING , CALL_STATE_INCOMING , CALL_STATE_ERROR , CALL_STATE_INCOMING , CALL_STATE_INCOMING },/**/
/*RINGING */ {CALL_STATE_ERROR , CALL_STATE_RINGING , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_RINGING },/**/
-/*CURRENT */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFER , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
+/*CURRENT */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
/*DIALING */ {CALL_STATE_DIALING , CALL_STATE_OVER , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*HOLD */ {CALL_STATE_ERROR , CALL_STATE_HOLD , CALL_STATE_TRANSF_HOLD , CALL_STATE_HOLD , CALL_STATE_HOLD },/**/
/*FAILURE */ {CALL_STATE_ERROR , CALL_STATE_FAILURE , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*BUSY */ {CALL_STATE_ERROR , CALL_STATE_BUSY , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
-/*TRANSFER */ {CALL_STATE_TRANSFER , CALL_STATE_TRANSFER , CALL_STATE_CURRENT , CALL_STATE_TRANSFER , CALL_STATE_TRANSFER },/**/
+/*TRANSFER */ {CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED },/**/
/*TRANSF_HOLD */ {CALL_STATE_TRANSF_HOLD, CALL_STATE_TRANSF_HOLD , CALL_STATE_HOLD , CALL_STATE_TRANSF_HOLD , CALL_STATE_TRANSF_HOLD },/**/
/*OVER */ {CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*ERROR */ {CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
-/*CONF */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFER , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
+/*CONF */ {CALL_STATE_ERROR , CALL_STATE_CURRENT , CALL_STATE_TRANSFERRED , CALL_STATE_CURRENT , CALL_STATE_CURRENT },/**/
/*CONF_HOLD */ {CALL_STATE_ERROR , CALL_STATE_HOLD , CALL_STATE_TRANSF_HOLD , CALL_STATE_HOLD , CALL_STATE_HOLD },/**/
};//
@@ -80,8 +80,8 @@ const call_state Call::stateChangedStateMap [13][6] =
/*HOLD */ {CALL_STATE_HOLD , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*FAILURE */ {CALL_STATE_FAILURE , CALL_STATE_FAILURE , CALL_STATE_BUSY , CALL_STATE_FAILURE , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*BUSY */ {CALL_STATE_BUSY , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_BUSY , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
-/*TRANSFER */ {CALL_STATE_TRANSFER , CALL_STATE_TRANSFER , CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
-/*TRANSF_HOLD */ {CALL_STATE_TRANSF_HOLD , CALL_STATE_TRANSFER , CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
+/*TRANSFER */ {CALL_STATE_TRANSFERRED , CALL_STATE_TRANSFERRED , CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
+/*TRANSF_HOLD */ {CALL_STATE_TRANSF_HOLD , CALL_STATE_TRANSFERRED , CALL_STATE_BUSY , CALL_STATE_TRANSF_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
/*OVER */ {CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER , CALL_STATE_OVER },/**/
/*ERROR */ {CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR , CALL_STATE_ERROR },/**/
/*CONF */ {CALL_STATE_CURRENT , CALL_STATE_CURRENT , CALL_STATE_BUSY , CALL_STATE_HOLD , CALL_STATE_OVER , CALL_STATE_FAILURE },/**/
@@ -127,8 +127,8 @@ Call::Call(call_state startState, QString callId, QString peerName, QString peer
changeCurrentState(startState) ;
this->m_Account = account ;
this->m_Recording = false ;
- this->m_pStartTime = NULL ;
- this->m_pStopTime = NULL ;
+ this->m_pStartTime = nullptr ;
+ this->m_pStopTime = nullptr ;
m_ContactChanged = true;
CallManagerInterface& callManager = CallManagerInterfaceSingleton::getInstance();
@@ -354,7 +354,7 @@ const QString Call::toHumanStateName() const
case CALL_STATE_BUSY:
return ( "Busy" );
break;
- case CALL_STATE_TRANSFER:
+ case CALL_STATE_TRANSFERRED:
return ( "Transfer" );
break;
case CALL_STATE_TRANSF_HOLD:
@@ -379,7 +379,7 @@ const QString Call::toHumanStateName() const
///Get the time (second from 1 jan 1970) when the call ended
QString Call::getStopTimeStamp() const
{
- if (m_pStopTime == NULL)
+ if (m_pStopTime == nullptr)
return QString("0");
return QString::number(m_pStopTime->toTime_t());
}
@@ -387,7 +387,7 @@ QString Call::getStopTimeStamp() const
///Get the time (second from 1 jan 1970) when the call started
QString Call::getStartTimeStamp() const
{
- if (m_pStartTime == NULL)
+ if (m_pStartTime == nullptr)
return QString("0");
return QString::number(m_pStartTime->toTime_t());
}
@@ -615,7 +615,7 @@ call_state Call::stateChanged(const QString& newStateName)
return m_CurrentState;
} //stateChanged
-///An acount have been performed
+///An account have been performed
call_state Call::actionPerformed(call_action action)
{
call_state previousState = m_CurrentState;
@@ -708,7 +708,7 @@ void Call::acceptTransf()
qDebug() << "Accepting call and transferring it to number : " << m_TransferNumber << ". callId : " << m_CallId << "ConfId:" << m_ConfId;
callManager.accept(m_CallId);
Q_NOREPLY callManager.transfer(m_CallId, m_TransferNumber);
-// m_HistoryState = TRANSFERED;
+// m_HistoryState = TRANSFERRED;
}
///Put the call on hold
@@ -868,7 +868,7 @@ void Call::appendText(const QString& str)
QString* editNumber;
switch (m_CurrentState) {
- case CALL_STATE_TRANSFER :
+ case CALL_STATE_TRANSFERRED :
case CALL_STATE_TRANSF_HOLD :
editNumber = &m_TransferNumber;
break;
@@ -891,7 +891,7 @@ void Call::backspaceItemText()
QString* editNumber;
switch (m_CurrentState) {
- case CALL_STATE_TRANSFER :
+ case CALL_STATE_TRANSFERRED :
case CALL_STATE_TRANSF_HOLD :
editNumber = &m_TransferNumber;
break;
diff --git a/kde/src/lib/CallModel.cpp b/kde/src/lib/CallModel.cpp
index 70fd6b8c0735b82425d411ab811b114647dafa51..a81bb2fdc37558fd7a2ff5e9b71be52c59b60b0b 100644
--- a/kde/src/lib/CallModel.cpp
+++ b/kde/src/lib/CallModel.cpp
@@ -65,7 +65,7 @@ CallModelBase::~CallModelBase()
///When a call state change
void CallModelBase::callStateChanged(const QString &callID, const QString &state)
{
- //This code is part of the CallModel iterface too
+ //This code is part of the CallModel interface too
qDebug() << "Call State Changed for call " << callID << " . New state : " << state;
Call* call = findCallByCallId(callID);
if(!call) {
diff --git a/kde/src/lib/CallModel.h b/kde/src/lib/CallModel.h
index a4711570ed57ad57692271f35c10c673d451e33e..b542f809fe50e28aebce0463b98a38fc5fd2e1db 100644
--- a/kde/src/lib/CallModel.h
+++ b/kde/src/lib/CallModel.h
@@ -87,7 +87,7 @@ private:
signals:
///Emitted when a call state change
void callStateChanged ( Call* call );
- ///Emitted when a new call is incomming
+ ///Emitted when a new call is incoming
void incomingCall ( Call* call );
///Emitted when a conference is created
void conferenceCreated ( Call* conf );
diff --git a/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp
index d49fb7dc7c1be191a8b4e459dbef239665602d0a..825db10d4b8ea57583d86bc9e80cafb33e5d2918 100644
--- a/kde/src/lib/CallModel.hpp
+++ b/kde/src/lib/CallModel.hpp
@@ -208,7 +208,7 @@ CALLMODEL_TEMPLATE Call* CALLMODEL_T::addDialingCall(const QString& peerName, Ac
}
} //addDialingCall
-///Create a new incomming call when the daemon is being called
+///Create a new incoming call when the daemon is being called
CALLMODEL_TEMPLATE Call* CALLMODEL_T::addIncomingCall(const QString& callId)
{
Call* call = Call::buildIncomingCall(callId);
@@ -240,7 +240,7 @@ CALLMODEL_TEMPLATE void CALLMODEL_T::removeCall(Call* call)
return;
}
- if (m_sPrivateCallList_call[call] != NULL) {
+ if (m_sPrivateCallList_call[call] != nullptr) {
m_sPrivateCallList_call.remove(call);
}
@@ -410,7 +410,7 @@ CALLMODEL_TEMPLATE Call* CALLMODEL_T::getCall ( const CallWidget widget
if (m_sPrivateCallList_widget[widget]) {
return m_sPrivateCallList_widget[widget]->call_real;
}
- return NULL;
+ return nullptr;
}
///Get a call list from a conference
@@ -487,7 +487,7 @@ CALLMODEL_TEMPLATE Call* CALLMODEL_T::getCall ( const Index idx
return m_sPrivateCallList_index[idx]->call_real;
}
qDebug() << "Call not found";
- return NULL;
+ return nullptr;
}
///Get the call associated with that conference index
@@ -517,7 +517,7 @@ CALLMODEL_TEMPLATE Call* CALLMODEL_T::getCall ( const QString& callId
if (m_sPrivateCallList_callId[callId]) {
return m_sPrivateCallList_callId[callId]->call_real;
}
- return NULL;
+ return nullptr;
}
///Get the calls associated with this ID
@@ -538,7 +538,7 @@ CALLMODEL_TEMPLATE Index CALLMODEL_T::getIndex ( const Call* call
if (m_sPrivateCallList_call[(Call*)call]) {
return m_sPrivateCallList_call[(Call*)call]->index;
}
- return NULL;
+ return nullptr;
}
///Get the index associated with this index (dummy implementation)
@@ -547,7 +547,7 @@ CALLMODEL_TEMPLATE Index CALLMODEL_T::getIndex ( const Index idx
if (m_sPrivateCallList_index[idx]) {
return m_sPrivateCallList_index[idx]->index;
}
- return NULL;
+ return nullptr;
}
///Get the index associated with this call
@@ -556,7 +556,7 @@ CALLMODEL_TEMPLATE Index CALLMODEL_T::getIndex ( const CallWidget widget
if (m_sPrivateCallList_widget[widget]) {
return m_sPrivateCallList_widget[widget]->index;
}
- return NULL;
+ return nullptr;
}
///Get the index associated with this ID
@@ -565,7 +565,7 @@ CALLMODEL_TEMPLATE Index CALLMODEL_T::getIndex ( const QString& callId
if (m_sPrivateCallList_callId[callId]) {
return m_sPrivateCallList_callId[callId]->index;
}
- return NULL;
+ return nullptr;
}
///Get the widget associated with this call
@@ -574,7 +574,7 @@ CALLMODEL_TEMPLATE CallWidget CALLMODEL_T::getWidget ( const Call* call
if (m_sPrivateCallList_call[call]) {
return m_sPrivateCallList_call[call]->call;
}
- return NULL;
+ return nullptr;
}
///Get the widget associated with this ID
@@ -583,7 +583,7 @@ CALLMODEL_TEMPLATE CallWidget CALLMODEL_T::getWidget ( const Index idx
if (m_sPrivateCallList_index[idx]) {
return m_sPrivateCallList_index[idx]->call;
}
- return NULL;
+ return nullptr;
}
///Get the widget associated with this widget (dummy)
@@ -592,7 +592,7 @@ CALLMODEL_TEMPLATE CallWidget CALLMODEL_T::getWidget ( const CallWidget widget
if (m_sPrivateCallList_widget[widget]) {
return m_sPrivateCallList_widget[widget]->call;
}
- return NULL;
+ return nullptr;
}
///Get the widget associated with this ID
@@ -601,7 +601,7 @@ CALLMODEL_TEMPLATE CallWidget CALLMODEL_T::getWidget ( const QString& widget
if (m_sPrivateCallList_widget[widget]) {
return m_sPrivateCallList_widget[widget]->call;
}
- return NULL;
+ return nullptr;
}
///Common set of instruction shared by all gui updater
diff --git a/kde/src/lib/CredentialModel.h b/kde/src/lib/CredentialModel.h
index c94dd9a3bb007d5af5e8273b778add686fe1709d..ad19245a46c5354234b020d1784c7ed6acc2965c 100644
--- a/kde/src/lib/CredentialModel.h
+++ b/kde/src/lib/CredentialModel.h
@@ -49,7 +49,7 @@ public:
void clear();
private:
- ///@struct CredentialData store credential informations
+ ///@struct CredentialData store credential information
struct CredentialData2 {
QString name ;
QString password;
diff --git a/kde/src/lib/VideoModel.cpp b/kde/src/lib/VideoModel.cpp
index 4330249027865dc9b0cf5bc581e41997a031f12a..728585260187438a728015044c4f5b9337ee3725 100644
--- a/kde/src/lib/VideoModel.cpp
+++ b/kde/src/lib/VideoModel.cpp
@@ -35,7 +35,7 @@
#include "VideoRenderer.h"
//Static member
-VideoModel* VideoModel::m_spInstance = NULL;
+VideoModel* VideoModel::m_spInstance = nullptr;
///Constructor
VideoModel::VideoModel():m_BufferSize(0),m_ShmKey(0),m_SemKey(0),m_PreviewState(false)
diff --git a/kde/src/lib/VideoRenderer.cpp b/kde/src/lib/VideoRenderer.cpp
index 0a502e43db94a52d8acfef8ce17f9501b1279844..ea510eeba2c59e995f0fe50eb4d885383e89712c 100644
--- a/kde/src/lib/VideoRenderer.cpp
+++ b/kde/src/lib/VideoRenderer.cpp
@@ -268,7 +268,7 @@ void VideoRenderer::stopRendering()
* *
****************************************************************************/
-///Get the raw bytes directly from the SHM, not recommanded, but optimal
+///Get the raw bytes directly from the SHM, not recommended, but optimal
const char* VideoRenderer::rawData()
{
return m_pShmArea->m_Data;
diff --git a/kde/src/lib/callmanager_interface_singleton.cpp b/kde/src/lib/callmanager_interface_singleton.cpp
index 8b2b07944cbfaf0f05d393c3adabb0530767c0fa..013442b51cb3b4533512ff17ab5419d40a79107d 100644
--- a/kde/src/lib/callmanager_interface_singleton.cpp
+++ b/kde/src/lib/callmanager_interface_singleton.cpp
@@ -21,7 +21,7 @@
#include "callmanager_interface_singleton.h"
-CallManagerInterface * CallManagerInterfaceSingleton::interface = NULL;
+CallManagerInterface * CallManagerInterfaceSingleton::interface = nullptr;
CallManagerInterface & CallManagerInterfaceSingleton::getInstance(){
diff --git a/kde/src/lib/configurationmanager_interface_singleton.cpp b/kde/src/lib/configurationmanager_interface_singleton.cpp
index 37628d74490dab5260f504a9506831ea548f3580..1a403adabdd707d4916f6eb925fa68878684509d 100644
--- a/kde/src/lib/configurationmanager_interface_singleton.cpp
+++ b/kde/src/lib/configurationmanager_interface_singleton.cpp
@@ -21,7 +21,7 @@
#include "configurationmanager_interface_singleton.h"
-ConfigurationManagerInterface* ConfigurationManagerInterfaceSingleton::interface = NULL;
+ConfigurationManagerInterface* ConfigurationManagerInterfaceSingleton::interface = nullptr;
ConfigurationManagerInterface & ConfigurationManagerInterfaceSingleton::getInstance()
{
diff --git a/kde/src/lib/instance_interface_singleton.cpp b/kde/src/lib/instance_interface_singleton.cpp
index ea3f75a031f9ad0905df4e2267a2c0651257be5f..429da445b60f5a22da359318d234ac724fb377b4 100644
--- a/kde/src/lib/instance_interface_singleton.cpp
+++ b/kde/src/lib/instance_interface_singleton.cpp
@@ -20,7 +20,7 @@
#include "instance_interface_singleton.h"
-InstanceInterface* InstanceInterfaceSingleton::interface = NULL;
+InstanceInterface* InstanceInterfaceSingleton::interface = nullptr;
InstanceInterface& InstanceInterfaceSingleton::getInstance()
{
diff --git a/kde/src/lib/sflphone_const.h b/kde/src/lib/sflphone_const.h
index f7b69856a50b811596222bfe7b93fc5d15d20a37..b595a48d9eb065a0abd2a2395616c21c5b00a68e 100644
--- a/kde/src/lib/sflphone_const.h
+++ b/kde/src/lib/sflphone_const.h
@@ -280,7 +280,7 @@ typedef enum
CALL_STATE_HOLD = 4, /** Call is on hold */
CALL_STATE_FAILURE = 5, /** Call has failed */
CALL_STATE_BUSY = 6, /** Call is busy */
- CALL_STATE_TRANSFER = 7, /** Call is being transfered. During this state, the user can enter the new number. */
+ CALL_STATE_TRANSFERRED = 7, /** Call is being transferred. During this state, the user can enter the new number. */
CALL_STATE_TRANSF_HOLD = 8, /** Call is on hold for transfer */
CALL_STATE_OVER = 9, /** Call is over and should not be used */
CALL_STATE_ERROR = 10,/** This state should never be reached */
diff --git a/kde/src/lib/video_interface_singleton.cpp b/kde/src/lib/video_interface_singleton.cpp
index a937b97a7ebb656e7911a2e56697f3e49e6cef95..905eda96949f65927404b1bc8f07e373c4987ce6 100644
--- a/kde/src/lib/video_interface_singleton.cpp
+++ b/kde/src/lib/video_interface_singleton.cpp
@@ -19,7 +19,7 @@
#include "video_interface_singleton.h"
-VideoInterface* VideoInterfaceSingleton::interface = NULL;
+VideoInterface* VideoInterfaceSingleton::interface = nullptr;
VideoInterface& VideoInterfaceSingleton::getInstance()
{
diff --git a/kde/src/test/account_test.cpp b/kde/src/test/account_test.cpp
index 605ee8dd44301c14856bd9ad370bdee34e946660..93f8b9cd91e42f66baa1d23a5dd076d59a50f2e2 100644
--- a/kde/src/test/account_test.cpp
+++ b/kde/src/test/account_test.cpp
@@ -613,7 +613,7 @@ void AccountTests::testDisableAllAccounts()
(*AccountList::getInstance())[i]->save();
}
- QCOMPARE(AccountList::getCurrentAccount(),(Account*)NULL);
+ QCOMPARE(AccountList::getCurrentAccount(),(Account*)nullptr);
//Restore state
for (int i=0;i<AccountList::getInstance()->size();i++) {
diff --git a/kde/src/test/call_test.cpp b/kde/src/test/call_test.cpp
index d8ea50106aa5d60212f45e257ce92f82f1fee0b7..757c0af86feb33e430a79834e7ea2eb3adc22114 100644
--- a/kde/src/test/call_test.cpp
+++ b/kde/src/test/call_test.cpp
@@ -32,7 +32,7 @@ void CallTests::testCallWithoutAccounts()
}
Call* call = m_pModel->addDialingCall("test call", AccountList::getCurrentAccount());
- QCOMPARE( call, (Call*)NULL );
+ QCOMPARE( call, (Call*)nullptr );
//Restore state
for (int i=0;i<AccountList::getInstance()->size();i++) {
diff --git a/kde/src/widgets/BookmarkDock.cpp b/kde/src/widgets/BookmarkDock.cpp
index 10b25f975efdf1c4062b8afbd456416963ca7674..e1f8460abb2d1622cc6067ef3e63bef454245639 100644
--- a/kde/src/widgets/BookmarkDock.cpp
+++ b/kde/src/widgets/BookmarkDock.cpp
@@ -127,7 +127,7 @@ BookmarkDock::~BookmarkDock()
void BookmarkDock::addBookmark_internal(const QString& phone)
{
HistoryTreeItem* widget = new HistoryTreeItem(m_pItemView,phone,true);
- QTreeWidgetItem* item = NULL;
+ QTreeWidgetItem* item = nullptr;
if (widget->getName() == i18nc("Unknown peer","Unknown") || widget->getName().isEmpty()) {
item = m_pItemView->addItem<QNumericTreeWidgetItem>(i18nc("Unknown peer","Unknown"));
diff --git a/kde/src/widgets/CallTreeItem.cpp b/kde/src/widgets/CallTreeItem.cpp
index 7eb94faafd06c94a5bbdcf5cd3a4301287bcb308..d4d6cc797b2c1834cc85e82595305fb592991549 100644
--- a/kde/src/widgets/CallTreeItem.cpp
+++ b/kde/src/widgets/CallTreeItem.cpp
@@ -378,7 +378,7 @@ void CallTreeItem::updated()
m_pIconL->setPixmap(QPixmap(KStandardDirs::locate("data","sflphone-client-kde/conf-small.png")));
}
- bool transfer = state == CALL_STATE_TRANSFER || state == CALL_STATE_TRANSF_HOLD;
+ bool transfer = state == CALL_STATE_TRANSFERRED || state == CALL_STATE_TRANSF_HOLD;
if (m_pTransferPrefixL && m_pTransferNumberL) {
m_pTransferPrefixL->setVisible(transfer);
m_pTransferNumberL->setVisible(transfer);
@@ -406,7 +406,7 @@ void CallTreeItem::updated()
else {
//kDebug() << "Updating item of call of state OVER. Doing nothing.";
}
- if (state == CALL_STATE_TRANSFER || state == CALL_STATE_TRANSF_HOLD) {
+ if (state == CALL_STATE_TRANSFERRED || state == CALL_STATE_TRANSF_HOLD) {
kDebug() << "Transferring";
emit askTransfer(m_pItemCall);
}
@@ -422,7 +422,7 @@ void CallTreeItem::updated()
}
//Start/Stop the elapsed time label
- if ((state == CALL_STATE_CURRENT || state == CALL_STATE_HOLD || state == CALL_STATE_TRANSFER) && !m_pTimer) {
+ if ((state == CALL_STATE_CURRENT || state == CALL_STATE_HOLD || state == CALL_STATE_TRANSFERRED) && !m_pTimer) {
m_pTimer = new QTimer(this);
m_pTimer->setInterval(1000);
connect(m_pTimer,SIGNAL(timeout()),this,SLOT(incrementTimer()));
@@ -440,7 +440,7 @@ void CallTreeItem::updated()
* *
****************************************************************************/
-///Called when a drag and drop occure while the item have not been dropped yet
+///Called when a drag and drop occur while the item have not been dropped yet
void CallTreeItem::dragEnterEvent ( QDragEnterEvent *e )
{
kDebug() << "Drag enter";
diff --git a/kde/src/widgets/CallTreeItem.h b/kde/src/widgets/CallTreeItem.h
index 841d32ee6c07acbf24b4759278c111c4c0771c4e..51146638ef98394c31abce1b94ffac48dbdef3bf 100644
--- a/kde/src/widgets/CallTreeItem.h
+++ b/kde/src/widgets/CallTreeItem.h
@@ -113,7 +113,7 @@ signals:
void over(Call*);
///Emitted when the item change
void changed();
- ///Emitted when it is required to expand the childs
+ ///Emitted when it is required to expand the childrens
void showChilds(CallTreeItem*);
///Emitted when a call is dropped on the "transfer" button
void askTransfer(Call*);
diff --git a/kde/src/widgets/ContactDock.cpp b/kde/src/widgets/ContactDock.cpp
index 012adcde6586ba33b0490c54e1ffec2e31ab3206..beb8b5169850f13a1f92a697e26ebcd4a7fe6d2a 100644
--- a/kde/src/widgets/ContactDock.cpp
+++ b/kde/src/widgets/ContactDock.cpp
@@ -32,13 +32,13 @@
#include <QtGui/QCheckBox>
#include <QtGui/QSplitter>
#include <QtGui/QLabel>
-#include <QtGui/QComboBox>
//KDE
#include <KDebug>
#include <KLineEdit>
#include <KLocalizedString>
#include <KIcon>
+#include <KComboBox>
//SFLPhone
#include "klib/AkonadiBackend.h"
@@ -120,7 +120,7 @@ ContactDock::ContactDock(QWidget* parent) : QDockWidget(parent)
setObjectName("contactDock");
m_pFilterLE = new KLineEdit ( );
m_pSplitter = new QSplitter ( Qt::Vertical,this );
- m_pSortByCBB = new QComboBox ( this );
+ m_pSortByCBB = new KComboBox ( this );
m_pContactView = new ContactTree ( this );
m_pCallView = new QListWidget ( this );
m_pShowHistoCK = new QCheckBox ( this );
@@ -286,7 +286,7 @@ void ContactDock::loadContactHistory(QTreeWidgetItem* item)
{
if (m_pShowHistoCK->isChecked()) {
m_pCallView->clear();
- if (dynamic_cast<QNumericTreeWidgetItem_hist*>(item) != NULL) {
+ if (dynamic_cast<QNumericTreeWidgetItem_hist*>(item) != nullptr) {
QNumericTreeWidgetItem_hist* realItem = dynamic_cast<QNumericTreeWidgetItem_hist*>(item);
foreach (Call* call, HistoryModel::getHistory()) {
if (realItem->widget != 0) {
@@ -342,12 +342,12 @@ void ContactDock::reloadHistoryConst()
* *
****************************************************************************/
-///Serialize informations to be used for drag and drop
+///Serialize information to be used for drag and drop
QMimeData* ContactTree::mimeData( const QList<QTreeWidgetItem *> items) const
{
kDebug() << "An history call is being dragged";
if (items.size() < 1) {
- return NULL;
+ return nullptr;
}
QMimeData *mimeData = new QMimeData();
@@ -413,7 +413,7 @@ void ContactDock::keyPressEvent(QKeyEvent* event) {
if (m_pContactView->selectedItems()[0] && m_pContactView->itemWidget(m_pContactView->selectedItems()[0],0)) {
QNumericTreeWidgetItem_hist* item = dynamic_cast<QNumericTreeWidgetItem_hist*>(m_pContactView->selectedItems()[0]);
if (item) {
- Call* call = NULL;
+ Call* call = nullptr;
SFLPhone::app()->view()->selectCallPhoneNumber(&call,item->widget->getContact());
}
}
diff --git a/kde/src/widgets/ContactDock.h b/kde/src/widgets/ContactDock.h
index afe17b712fe372d1ae449649a77d821098810910..51775fba47e79b2026fcf013c9d7f7fddf4c1d9e 100644
--- a/kde/src/widgets/ContactDock.h
+++ b/kde/src/widgets/ContactDock.h
@@ -30,7 +30,6 @@
//Qt
class QSplitter;
class QListWidget;
-class QComboBox;
class QTreeWidgetItem;
class QCheckBox;
class QStringList;
@@ -38,6 +37,7 @@ class DateTime;
//KDE
class KLineEdit;
+class KComboBox;
namespace Akonadi {
class EntityTreeView;
@@ -73,7 +73,7 @@ private:
QSplitter* m_pSplitter ;
ContactTree* m_pContactView;
QListWidget* m_pCallView ;
- QComboBox* m_pSortByCBB ;
+ KComboBox* m_pSortByCBB ;
QCheckBox* m_pShowHistoCK;
QList<ContactItemWidget*> m_Contacts ;
diff --git a/kde/src/widgets/ContactItemWidget.cpp b/kde/src/widgets/ContactItemWidget.cpp
index 8029e970355cd30d25f468944b7e85c4fc1e2524..a26d06ecfc84fc8e4f0948592d086d4f72c73f20 100644
--- a/kde/src/widgets/ContactItemWidget.cpp
+++ b/kde/src/widgets/ContactItemWidget.cpp
@@ -434,7 +434,6 @@ void ContactItemWidget::addPhone()
{
kDebug() << "Adding to contact";
bool ok;
- //QString number = QInputDialog::getText(0, i18n("Enter a new number"),i18n("New number:"),QLineEdit::Normal,QString(),ok,0);
QString text = QInputDialog::getText(this, i18n("Enter a new number"), i18n("New number:"), QLineEdit::Normal, QString(), &ok);
if (ok && !text.isEmpty()) {
AkonadiBackend::getInstance()->addPhoneNumber(m_pContactKA,text,"work");
@@ -456,7 +455,7 @@ void ContactItemWidget::bookmark()
* *
****************************************************************************/
-///Called when a drag and drop occure while the item have not been dropped yet
+///Called when a drag and drop occur while the item have not been dropped yet
void ContactItemWidget::dragEnterEvent ( QDragEnterEvent *e )
{
kDebug() << "Drag enter";
@@ -498,7 +497,7 @@ void ContactItemWidget::transferEvent(QMimeData* data)
if (ok) {
Call* call = SFLPhone::model()->getCall(data->data(MIME_CALLID));
if (dynamic_cast<Call*>(call)) {
- call->changeCurrentState(CALL_STATE_TRANSFER);
+ call->changeCurrentState(CALL_STATE_TRANSFERRED);
SFLPhone::model()->transfer(call, result);
}
}
diff --git a/kde/src/widgets/HistoryDock.cpp b/kde/src/widgets/HistoryDock.cpp
index 01ac6b0c5628950567730f42fc04e620c112c2ec..6777ee402219da5de88f4b321ec050373fdb2724 100644
--- a/kde/src/widgets/HistoryDock.cpp
+++ b/kde/src/widgets/HistoryDock.cpp
@@ -25,7 +25,6 @@
#include <QtCore/QString>
#include <QtCore/QDate>
#include <QtGui/QTreeWidget>
-#include <QtGui/QComboBox>
#include <QtGui/QPushButton>
#include <QtGui/QLabel>
#include <QtGui/QTreeWidgetItem>
@@ -38,6 +37,7 @@
#include <KIcon>
#include <KLineEdit>
#include <KDateWidget>
+#include <KComboBox>
//SFLPhone
#include "SFLPhone.h"
@@ -92,7 +92,7 @@ HistoryDock::HistoryDock(QWidget* parent) : QDockWidget(parent)
setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
m_pFilterLE = new KLineEdit ( );
m_pItemView = new HistoryTree ( this );
- m_pSortByCBB = new QComboBox ( );
+ m_pSortByCBB = new KComboBox ( );
m_pSortByL = new QLabel ( i18n("Sort by:") );
m_pFromL = new QLabel ( i18n("From:") );
m_pToL = new QLabel ( i18nc("To date:","To:"));
@@ -197,7 +197,7 @@ HistoryDock::~HistoryDock()
* *
****************************************************************************/
-///Update informations
+///Update information
void HistoryDock::updateContactInfo()
{
foreach(HistoryTreeItem* hitem, m_History) {
@@ -381,7 +381,7 @@ QMimeData* HistoryTree::mimeData( const QList<QTreeWidgetItem *> items) const
{
kDebug() << "An history call is being dragged";
if (items.size() < 1) {
- return NULL;
+ return nullptr;
}
QMimeData *mimeData = new QMimeData();
diff --git a/kde/src/widgets/HistoryDock.h b/kde/src/widgets/HistoryDock.h
index dee17409190ae0fc290eaf6fbd6d5ba5ce33bd06..f4d2a6dfcc91feea4c79caa2af39b7ec74852c0c 100644
--- a/kde/src/widgets/HistoryDock.h
+++ b/kde/src/widgets/HistoryDock.h
@@ -32,7 +32,7 @@
class QTreeWidgetItem;
class QString;
class QTreeWidget;
-class QComboBox;
+class KComboBox;
class QLabel;
class QCheckBox;
class QPushButton;
@@ -68,7 +68,7 @@ private:
//Attributes
HistoryTree* m_pItemView ;
KLineEdit* m_pFilterLE ;
- QComboBox* m_pSortByCBB ;
+ KComboBox* m_pSortByCBB ;
QLabel* m_pSortByL ;
QLabel* m_pFromL ;
QLabel* m_pToL ;
diff --git a/kde/src/widgets/HistoryTreeItem.cpp b/kde/src/widgets/HistoryTreeItem.cpp
index 9d5d8325e9024204be879a091c6d45aba95898d2..76b2f08f747a56406c0371cb10a07e8a600964ac 100644
--- a/kde/src/widgets/HistoryTreeItem.cpp
+++ b/kde/src/widgets/HistoryTreeItem.cpp
@@ -307,7 +307,7 @@ void HistoryTreeItem::copy()
}
-///Create a contact from those informations
+///Create a contact from those information
void HistoryTreeItem::addContact()
{
kDebug() << "Adding contact";
@@ -548,7 +548,7 @@ bool HistoryTreeItem::getContactInfo(QString phoneNumber)
if (m_pContact) {
m_Name = m_pContact->getFormattedName();
m_pPeerNameL->setText("<b>"+m_Name+"</b>");
- if (m_pContact->getPhoto() != NULL) {
+ if (m_pContact->getPhoto() != nullptr) {
pxm = (*m_pContact->getPhoto());
QRect pxRect = pxm.rect();
QBitmap mask(pxRect.size());
@@ -640,7 +640,7 @@ uint HistoryTreeItem::getDurWidth()
return fm.width(m_pLengthL->text());
}
-///Called when a drag and drop occure while the item have not been dropped yet
+///Called when a drag and drop occur while the item have not been dropped yet
void HistoryTreeItem::dragEnterEvent ( QDragEnterEvent *e )
{
kDebug() << "Drag enter";
@@ -679,7 +679,7 @@ void HistoryTreeItem::transferEvent(QMimeData* data)
if (data->hasFormat( MIME_CALLID)) {
Call* call = SFLPhone::model()->getCall(data->data(MIME_CALLID));
if (dynamic_cast<Call*>(call)) {
- call->changeCurrentState(CALL_STATE_TRANSFER);
+ call->changeCurrentState(CALL_STATE_TRANSFERRED);
SFLPhone::model()->transfer(call, m_pItemCall->getPeerPhoneNumber());
}
}
diff --git a/kde/src/widgets/IMManager.cpp b/kde/src/widgets/IMManager.cpp
index ccdd1862e47a60edf7e9707c6ff95f490b14f85c..b8166650cc79767cd80558e32a8a0ae67b6444b9 100644
--- a/kde/src/widgets/IMManager.cpp
+++ b/kde/src/widgets/IMManager.cpp
@@ -24,7 +24,7 @@
#include <KDebug>
#include <KLocale>
-IMManager::IMManager(QWidget* parent) : QTabWidget(parent)
+IMManager::IMManager(QWidget* parent) : KTabWidget(parent)
{
setVisible(false);
setTabsClosable(true);
diff --git a/kde/src/widgets/IMManager.h b/kde/src/widgets/IMManager.h
index 28bfdce456131477cfd16050ff69f2aa0b66b72d..e3ebf5f151d19c07dfd479c18fee924a4e2619d3 100644
--- a/kde/src/widgets/IMManager.h
+++ b/kde/src/widgets/IMManager.h
@@ -21,15 +21,18 @@
#ifndef IM_MANAGER_H
#define IM_MANAGER_H
+//Qt
#include <QtCore/QHash>
-#include <QtGui/QTabWidget>
+
+//KDE
+#include <KTabWidget>
//SFLPhone
class IMTab;
class InstantMessagingModel;
class Call;
-class IMManager : public QTabWidget
+class IMManager : public KTabWidget
{
Q_OBJECT
public: