diff --git a/kde/src/AccountListModel.cpp b/kde/src/AccountListModel.cpp
index 32c4760bf4a91cb42c72b00dce2ebf4543d599cf..e1b1b3d2737d03537af9bc532ef89c3bd7907680 100755
--- a/kde/src/AccountListModel.cpp
+++ b/kde/src/AccountListModel.cpp
@@ -146,7 +146,7 @@ bool AccountListModel::removeAccount( int index )
}
///Add an account
-bool AccountListModel::addAccount( QString alias )
+bool AccountListModel::addAccount(const QString& alias )
{
accounts->addAccount(alias);
emit dataChanged(this->index(0, 0, QModelIndex()), this->index(rowCount(), 0, QModelIndex()));
diff --git a/kde/src/AccountListModel.h b/kde/src/AccountListModel.h
index 2ea17f237df1c45bd6ac77185396372dd422be41..b62566809bc20660930b4bd502dcb1531ef12050 100755
--- a/kde/src/AccountListModel.h
+++ b/kde/src/AccountListModel.h
@@ -49,10 +49,10 @@ public:
virtual bool setData ( const QModelIndex& index, const QVariant &value, int role) ;
//Mutators
- bool accountUp ( int index );
- bool accountDown ( int index );
- bool removeAccount ( int index );
- bool addAccount ( QString alias );
+ bool accountUp ( int index );
+ bool accountDown ( int index );
+ bool removeAccount ( int index );
+ bool addAccount ( const QString& alias );
QString getOrderedList() const;
};
diff --git a/kde/src/AccountView.cpp b/kde/src/AccountView.cpp
index 9ddf77bc35f9a9a0c3c40a999a01fe01bf27115a..d45f10b3aa17b7504f1287fab94abe3d554cff73 100644
--- a/kde/src/AccountView.cpp
+++ b/kde/src/AccountView.cpp
@@ -97,7 +97,7 @@ QColor AccountView::getStateColor()
}
///Get the color name
-QString AccountView::getStateColorName()
+const QString& AccountView::getStateColorName()
{
if(getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_UNREGISTERED)
return "black";
@@ -120,7 +120,7 @@ bool AccountView::isChecked() const
****************************************************************************/
///Build an item from an account id
-AccountView* AccountView::buildExistingAccountFromId(QString _accountId)
+AccountView* AccountView::buildExistingAccountFromId(const QString& _accountId)
{
//Account* a = Account::buildExistingAccountFromId( _accountId);
ConfigurationManagerInterface& configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
@@ -132,7 +132,7 @@ AccountView* AccountView::buildExistingAccountFromId(QString _accountId)
}
///Build an item from an alias
-AccountView* AccountView::buildNewAccountFromAlias(QString alias)
+AccountView* AccountView::buildNewAccountFromAlias(const QString& alias)
{
//Account* a = Account::buildNewAccountFromAlias(alias);
AccountView* a = new AccountView();
diff --git a/kde/src/AccountView.h b/kde/src/AccountView.h
index cb824c98089e57e30d911f43bfe51bd55a5fb34a..2fbc56623ee48f184a1c7baceb909941060ec06f 100644
--- a/kde/src/AccountView.h
+++ b/kde/src/AccountView.h
@@ -44,12 +44,12 @@ class AccountView : public Account, public Item<AccountItemWidget> {
QListWidgetItem* getItem () ;
AccountItemWidget* getItemWidget () ;
QColor getStateColor () ;
- QString getStateColorName () ;
+ const QString& getStateColorName () ;
bool isChecked () const;
//Mutators
- static AccountView* buildExistingAccountFromId ( QString _accountId );
- static AccountView* buildNewAccountFromAlias ( QString alias );
+ static AccountView* buildExistingAccountFromId (const QString& _accountId );
+ static AccountView* buildNewAccountFromAlias (const QString& alias );
virtual void updateState();
private:
diff --git a/kde/src/AkonadiBackend.cpp b/kde/src/AkonadiBackend.cpp
index 4f9187e8e6049b38832f103e8cc4de1b0e8b2bbb..32f62a93f8a44eb8ec379ee8f28dfe7f9a1281fc 100644
--- a/kde/src/AkonadiBackend.cpp
+++ b/kde/src/AkonadiBackend.cpp
@@ -86,13 +86,13 @@ ContactBackend* AkonadiBackend::getInstance()
}
///Find contact using a phone number
-Contact* AkonadiBackend::getContactByPhone(QString phoneNumber)
+Contact* AkonadiBackend::getContactByPhone(const QString& phoneNumber)
{
return m_ContactByPhone[phoneNumber];
}
///Find contact by UID
-Contact* AkonadiBackend::getContactByUid(QString uid)
+Contact* AkonadiBackend::getContactByUid(const QString& uid)
{
return m_ContactByUid[uid];
}
diff --git a/kde/src/AkonadiBackend.h b/kde/src/AkonadiBackend.h
index b9cefe20cec45a398e1e58701fc691da809d55fc..89a3224ef20ee2767b6bc637f3c985d4111287c1 100644
--- a/kde/src/AkonadiBackend.h
+++ b/kde/src/AkonadiBackend.h
@@ -48,10 +48,10 @@ class AkonadiBackend : public ContactBackend {
Q_OBJECT
public:
static ContactBackend* getInstance();
- Contact* getContactByPhone ( QString phoneNumber );
- Contact* getContactByUid ( QString uid );
- void editContact ( Contact* contact );
- void addNewContact ( Contact* contact );
+ Contact* getContactByPhone ( const QString& phoneNumber );
+ Contact* getContactByUid ( const QString& uid );
+ void editContact ( Contact* contact );
+ void addNewContact ( Contact* contact );
private:
AkonadiBackend(QObject* parent);
diff --git a/kde/src/CallView.cpp b/kde/src/CallView.cpp
index b8d422ef7a2485b17f84ecbbda38c2114ef7e199..c14a5211b2ac2c231d9f0a0087e9fd25b27522a9 100644
--- a/kde/src/CallView.cpp
+++ b/kde/src/CallView.cpp
@@ -326,7 +326,7 @@ Call* CallView::addCall(Call* call, Call* parent)
****************************************************************************/
///Set the TreeView header text
-void CallView::setTitle(QString title)
+void CallView::setTitle(const QString& title)
{
headerItem()->setText(0,title);
}
@@ -369,7 +369,7 @@ QWidget* CallView::getWidget()
}
///Convenience wrapper around extractItem(QTreeWidgetItem*)
-QTreeWidgetItem* CallView::extractItem(QString callId)
+QTreeWidgetItem* CallView::extractItem(const QString& callId)
{
QTreeWidgetItem* currentItem = SFLPhone::model()->getIndex(callId);
return extractItem(currentItem);
diff --git a/kde/src/CallView.h b/kde/src/CallView.h
index cf9ed39b89e4a0a2380787a1e96d9e247e18fd37..65770b51eeb3b303cca544fa5dd4f393fb7092bd 100644
--- a/kde/src/CallView.h
+++ b/kde/src/CallView.h
@@ -53,14 +53,14 @@ class CallView : public QTreeWidget {
CallView ( QWidget* parent = 0 );
Call* getCurrentItem ( );
QWidget* getWidget ( );
- void setTitle ( QString title );
+ void setTitle ( const QString& title );
bool selectItem ( Call* item );
bool removeItem ( Call* item );
bool dropMimeData ( QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action );
virtual QMimeData* mimeData ( const QList<QTreeWidgetItem *> items ) const;
private:
- QTreeWidgetItem* extractItem ( QString callId );
+ QTreeWidgetItem* extractItem ( const QString& callId );
QTreeWidgetItem* extractItem ( QTreeWidgetItem* item );
CallTreeItem* insertItem ( QTreeWidgetItem* item, QTreeWidgetItem* parent=0 );
CallTreeItem* insertItem ( QTreeWidgetItem* item, Call* parent );
diff --git a/kde/src/Codec.cpp b/kde/src/Codec.cpp
index 08af79488343f757649c5f80e2030f016203a6ce..3b4142ff77a183afde726609d02b43f0cd906821 100755
--- a/kde/src/Codec.cpp
+++ b/kde/src/Codec.cpp
@@ -50,31 +50,31 @@ Codec::Codec(int payload, bool enabled)
****************************************************************************/
///Return the payload
-QString Codec::getPayload() const
+const QString& Codec::getPayload() const
{
return m_Payload;
}
///Return the codec name
-QString Codec::getName() const
+const QString& Codec::getName() const
{
return m_Name;
}
///Return the frequency
-QString Codec::getFrequency() const
+const QString& Codec::getFrequency() const
{
return m_Frequency;
}
///Return the bitrate
-QString Codec::getBitrate() const
+const QString& Codec::getBitrate() const
{
return m_Bitrate;
}
///Return the bandwidth
-QString Codec::getBandwidth() const
+const QString& Codec::getBandwidth() const
{
return m_Bandwidth;
}
@@ -93,31 +93,31 @@ bool Codec::isEnabled() const
****************************************************************************/
///Set the payload
-void Codec::setPayload(QString payload)
+void Codec::setPayload(const QString& payload)
{
m_Payload = payload;
}
///Set the codec name
-void Codec::setName(QString name)
+void Codec::setName(const QString& name)
{
m_Name = name;
}
///Set the frequency
-void Codec::setFrequency(QString frequency)
+void Codec::setFrequency(const QString& frequency)
{
m_Frequency = frequency;
}
///Set the bitrate
-void Codec::setBitrate(QString bitrate)
+void Codec::setBitrate(const QString& bitrate)
{
m_Bitrate = bitrate;
}
///Set the bandwidth
-void Codec::setBandwidth(QString bandwidth)
+void Codec::setBandwidth(const QString& bandwidth)
{
m_Bandwidth = bandwidth;
}
diff --git a/kde/src/Codec.h b/kde/src/Codec.h
index 05700756930c631833df2d042a1296be5f48c774..fc17948dd58afe561eba0880546cd11c0b2555fc 100755
--- a/kde/src/Codec.h
+++ b/kde/src/Codec.h
@@ -35,19 +35,19 @@ public:
Codec(int payload, bool enabled);
//Getters
- QString getPayload () const;
- QString getName () const;
- QString getFrequency () const;
- QString getBitrate () const;
- QString getBandwidth () const;
- bool isEnabled () const;
+ const QString& getPayload () const;
+ const QString& getName () const;
+ const QString& getFrequency () const;
+ const QString& getBitrate () const;
+ const QString& getBandwidth () const;
+ bool isEnabled () const;
//Setters
- void setPayload ( QString payload );
- void setName ( QString name );
- void setFrequency ( QString frequency );
- void setBitrate ( QString bitrate );
- void setBandwidth ( QString bandwidth );
+ void setPayload ( const QString& payload );
+ void setName ( const QString& name );
+ void setFrequency ( const QString& frequency );
+ void setBitrate ( const QString& bitrate );
+ void setBandwidth ( const QString& bandwidth );
void setEnabled ( bool enabled );
private:
diff --git a/kde/src/conf/ConfigAccountList.cpp b/kde/src/conf/ConfigAccountList.cpp
index 1f7df77f442ddd549d772f577888fa053e36f2c3..3aee086dbcbb068820157129ef91923d76f8198d 100644
--- a/kde/src/conf/ConfigAccountList.cpp
+++ b/kde/src/conf/ConfigAccountList.cpp
@@ -29,7 +29,7 @@ AccountView* ConfigAccountList::getAccountByItem(QListWidgetItem * item)
return NULL;
}
-AccountView* ConfigAccountList::addAccount(QString & alias)
+AccountView* ConfigAccountList::addAccount(const QString& alias)
{
AccountView* a = AccountView::buildNewAccountFromAlias(alias);
(*accounts) += a;
diff --git a/kde/src/conf/ConfigAccountList.h b/kde/src/conf/ConfigAccountList.h
index a8a57b21474b5d39e3251a83b3c2201595ed7613..c2b8bd09cbd2a1dbb975e056e7b274afd2114754 100644
--- a/kde/src/conf/ConfigAccountList.h
+++ b/kde/src/conf/ConfigAccountList.h
@@ -26,7 +26,7 @@ class ConfigAccountList : public QObject {
AccountView* getAccountById ( const QString & id ) const;
///Mutators
- virtual AccountView* addAccount ( QString & alias );
+ virtual AccountView* addAccount ( const QString & alias );
void removeAccount ( QListWidgetItem* item );
void removeAccount ( AccountView* account );
void update ( );
diff --git a/kde/src/lib/Account.cpp b/kde/src/lib/Account.cpp
index 449ea381fec539095ddd550a83594453918ce332..2b7acc895102dab0bf9d3fa9b46bedd4f612d343 100644
--- a/kde/src/lib/Account.cpp
+++ b/kde/src/lib/Account.cpp
@@ -33,27 +33,38 @@
#include "configurationmanager_interface_singleton.h"
///Match state name to user readable string
-const QString account_state_name(QString & s)
-{
+const QString& account_state_name(const QString& s)
+{
+ static const QString registered = "Registered" ;
+ static const QString notRegistered = "Not Registered" ;
+ static const QString trying = "Trying..." ;
+ static const QString error = "Error" ;
+ static const QString authenticationFailed = "Authentication Failed" ;
+ static const QString networkUnreachable = "Network unreachable" ;
+ static const QString hostUnreachable = "Host unreachable" ;
+ static const QString stunConfigurationError = "Stun configuration error" ;
+ static const QString stunServerInvalid = "Stun server invalid" ;
+ static const QString invalid = "Invalid" ;
+
if(s == QString(ACCOUNT_STATE_REGISTERED) )
- return "Registered" ;
+ return registered ;
if(s == QString(ACCOUNT_STATE_UNREGISTERED) )
- return "Not Registered" ;
+ return notRegistered ;
if(s == QString(ACCOUNT_STATE_TRYING) )
- return "Trying..." ;
+ return trying ;
if(s == QString(ACCOUNT_STATE_ERROR) )
- return "Error" ;
+ return error ;
if(s == QString(ACCOUNT_STATE_ERROR_AUTH) )
- return "Authentication Failed" ;
+ return authenticationFailed ;
if(s == QString(ACCOUNT_STATE_ERROR_NETWORK) )
- return "Network unreachable" ;
+ return networkUnreachable ;
if(s == QString(ACCOUNT_STATE_ERROR_HOST) )
- return "Host unreachable" ;
+ return hostUnreachable ;
if(s == QString(ACCOUNT_STATE_ERROR_CONF_STUN) )
- return "Stun configuration error" ;
+ return stunConfigurationError ;
if(s == QString(ACCOUNT_STATE_ERROR_EXIST_STUN) )
- return "Stun server invalid" ;
- return "Invalid" ;
+ return stunServerInvalid ;
+ return invalid ;
}
///Constructors
@@ -62,7 +73,7 @@ Account::Account():m_pAccountId(NULL),m_pAccountDetails(NULL)
}
///Build an account from it'id
-Account* Account::buildExistingAccountFromId(QString _accountId)
+Account* Account::buildExistingAccountFromId(const QString& _accountId)
{
qDebug() << "Building an account from id: " << _accountId;
ConfigurationManagerInterface& configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
@@ -79,7 +90,7 @@ Account* Account::buildExistingAccountFromId(QString _accountId)
}
///Build an account from it's name / alias
-Account* Account::buildNewAccountFromAlias(QString alias)
+Account* Account::buildNewAccountFromAlias(const QString& alias)
{
qDebug() << "Building an account from alias: " << alias;
Account* a = new Account();
@@ -108,7 +119,7 @@ bool Account::isNew() const
}
///Get this account ID
-const QString & Account::getAccountId() const
+const QString& Account::getAccountId() const
{
if (isNew())
qDebug() << "Error : getting AccountId of a new account.";
@@ -121,19 +132,19 @@ const QString & Account::getAccountId() const
}
///Get this account details
-MapStringString& Account::getAccountDetails() const
+const MapStringString& Account::getAccountDetails() const
{
return *m_pAccountDetails;
}
///Get current state
-QString Account::getStateName(QString & state)
+const QString& Account::getStateName(const QString& state) const
{
- return account_state_name(state);
+ return (const QString&)account_state_name(state);
}
///Get an account detail
-QString Account::getAccountDetail(QString param) const
+const QString& Account::getAccountDetail(const QString& param) const
{
if (!m_pAccountDetails) {
qDebug() << "The account list is not set";
@@ -148,7 +159,7 @@ QString Account::getAccountDetail(QString param) const
}
///Get the alias
-QString Account::getAlias() const
+const QString& Account::getAlias() const
{
return getAccountDetail(ACCOUNT_ALIAS);
}
@@ -175,19 +186,19 @@ bool Account::isRegistered() const
****************************************************************************/
///Set account details
-void Account::setAccountDetails(MapStringString m)
+void Account::setAccountDetails(const MapStringString& m)
{
*m_pAccountDetails = m;
}
///Set a specific detail
-void Account::setAccountDetail(QString param, QString val)
+void Account::setAccountDetail(const QString& param, const QString& val)
{
(*m_pAccountDetails)[param] = val;
}
///Set the account id
-void Account::setAccountId(QString id)
+void Account::setAccountId(const QString& id)
{
qDebug() << "accountId = " << m_pAccountId;
if (! isNew())
diff --git a/kde/src/lib/Account.h b/kde/src/lib/Account.h
index fa0b619685432d98c14544b4a20db19a4dc678b2..a746dae223069bf951a09e0fb2d8644d990af0b5 100644
--- a/kde/src/lib/Account.h
+++ b/kde/src/lib/Account.h
@@ -27,7 +27,7 @@ class QString;
#include "typedefs.h"
-const QString account_state_name(QString & s);
+const QString& account_state_name(const QString& s);
///@class Account a daemon account (SIP or AIX)
class LIB_EXPORT Account : public QObject {
@@ -36,23 +36,23 @@ class LIB_EXPORT Account : public QObject {
public:
~Account();
//Constructors
- static Account* buildExistingAccountFromId(QString _accountId);
- static Account* buildNewAccountFromAlias(QString alias);
+ static Account* buildExistingAccountFromId(const QString& _accountId);
+ static Account* buildNewAccountFromAlias(const QString& alias);
//Getters
- bool isNew() const;
- const QString& getAccountId() const;
- MapStringString& getAccountDetails() const;
- QString getStateName(QString & state) ;
- QString getAccountDetail(QString param) const;
- QString getAlias() const;
- bool isEnabled() const;
- bool isRegistered() const;
+ bool isNew() const;
+ const QString& getAccountId() const;
+ const MapStringString& getAccountDetails() const;
+ const QString& getStateName(const QString& state) const;
+ const QString& getAccountDetail(const QString& param) const;
+ const QString& getAlias() const;
+ bool isEnabled() const;
+ bool isRegistered() const;
//Setters
- void setAccountId (QString id );
- void setAccountDetails (MapStringString m );
- void setAccountDetail (QString param, QString val );
+ void setAccountId (const QString& id );
+ void setAccountDetails (const MapStringString& m );
+ void setAccountDetail (const QString& param, const QString& val );
//Updates
virtual void updateState();
diff --git a/kde/src/lib/AccountList.cpp b/kde/src/lib/AccountList.cpp
index dc5211b887b5c5ead95cfd1e6d472beda39f724d..8a99b6b899a9095ffd4fc7a81df429b6cdf3f50f 100644
--- a/kde/src/lib/AccountList.cpp
+++ b/kde/src/lib/AccountList.cpp
@@ -99,7 +99,7 @@ void AccountList::updateAccounts()
****************************************************************************/
///Get all accounts
-QVector<Account*> & AccountList::getAccounts()
+const QVector<Account*>& AccountList::getAccounts()
{
return *m_pAccounts;
}
@@ -139,7 +139,7 @@ Account* AccountList::getAccountById(const QString & id) const
}
///Get account with a specific state
-QVector<Account*> AccountList::getAccountsByState(QString & state)
+QVector<Account*> AccountList::getAccountsByState(const QString& state)
{
QVector<Account *> v;
for (int i = 0; i < m_pAccounts->size(); ++i) {
diff --git a/kde/src/lib/AccountList.h b/kde/src/lib/AccountList.h
index c3f26744ecf710d371c7373de478c504bf005e95..68f995b08dfd2bde6c4891fafed49d22a1e6be08 100644
--- a/kde/src/lib/AccountList.h
+++ b/kde/src/lib/AccountList.h
@@ -40,14 +40,14 @@ public:
~AccountList();
//Getters
- QVector<Account*>& getAccounts ( );
- QVector<Account*> getAccountsByState ( QString & state );
- QString getOrderedList ( ) const;
- Account* getAccountById ( const QString& id ) const;
- Account* getAccountAt ( int i );
- const Account* getAccountAt ( int i ) const;
- int size ( ) const;
- Account* firstRegisteredAccount ( ) const;
+ const QVector<Account*>& getAccounts ( );
+ QVector<Account*> getAccountsByState ( const QString& state );
+ QString getOrderedList ( ) const;
+ Account* getAccountById ( const QString& id ) const;
+ Account* getAccountAt ( int i );
+ const Account* getAccountAt ( int i ) const;
+ int size ( ) const;
+ Account* firstRegisteredAccount ( ) const;
//Mutators
virtual Account* addAccount ( QString & alias ) ;
diff --git a/kde/src/lib/Call.cpp b/kde/src/lib/Call.cpp
index 93cbe28c22ab980113985829c7eedabedbdb7457..4d8b0b6debded3f66fc5bb5f180b63066b6c0351 100644
--- a/kde/src/lib/Call.cpp
+++ b/kde/src/lib/Call.cpp
@@ -312,7 +312,7 @@ daemon_call_state Call::toDaemonCallState(const QString & stateName)
}
///Get the time (second from 1 jan 1970) when the call ended
-QString Call::getStopTimeStamp() const
+QString Call::getStopTimeStamp() const
{
if (m_pStopTime == NULL)
return QString();
@@ -320,7 +320,7 @@ QString Call::getStopTimeStamp() const
}
///Get the time (second from 1 jan 1970) when the call started
-QString Call::getStartTimeStamp() const
+QString Call::getStartTimeStamp() const
{
if (m_pStartTime == NULL)
return QString();
@@ -328,61 +328,61 @@ QString Call::getStartTimeStamp() const
}
///Get the number where the call have been transferred
-QString Call::getTransferNumber() const
+const QString& Call::getTransferNumber() const
{
return m_TransferNumber;
}
///Get the call / peer number
-QString Call::getCallNumber() const
+const QString& Call::getCallNumber() const
{
return m_CallNumber;
}
///Return the call id
-QString Call::getCallId() const
+const QString& Call::getCallId() const
{
return m_CallId;
}
///Return the peer phone number
-QString Call::getPeerPhoneNumber() const
+const QString& Call::getPeerPhoneNumber() const
{
return m_PeerPhoneNumber;
}
///Get the peer name
-QString Call::getPeerName() const
+const QString& Call::getPeerName() const
{
return m_PeerName;
}
///Get the current state
-call_state Call::getCurrentState() const
+call_state Call::getCurrentState() const
{
return m_CurrentState;
}
///Get the call recording
-bool Call::getRecording() const
+bool Call::getRecording() const
{
return m_Recording;
}
///Get the call account id
-QString Call::getAccountId() const
+const QString& Call::getAccountId() const
{
return m_Account;
}
///Is this call a conference
-bool Call::isConference() const
+bool Call::isConference() const
{
return m_isConference;
}
///Get the conference ID
-QString Call::getConfId() const
+const QString& Call::getConfId() const
{
return m_ConfId;
}
@@ -395,19 +395,19 @@ QString Call::getCurrentCodecName() const
}
///Get the state
-call_state Call::getState() const
+call_state Call::getState() const
{
return m_CurrentState;
}
///Get the history state
-history_state Call::getHistoryState() const
+history_state Call::getHistoryState() const
{
return m_HistoryState;
}
///Is this call over?
-bool Call::isHistory() const
+bool Call::isHistory() const
{
return (getState() == CALL_STATE_OVER);
}
@@ -437,7 +437,7 @@ bool Call::isSecure() const {
****************************************************************************/
///Set the transfer number
-void Call::setTransferNumber(QString number)
+void Call::setTransferNumber(const QString& number)
{
m_TransferNumber = number;
}
@@ -449,7 +449,7 @@ void Call::setConference(bool value)
}
///Set the call number
-void Call::setCallNumber(QString number)
+void Call::setCallNumber(const QString& number)
{
m_CallNumber = number;
emit changed();
@@ -706,7 +706,7 @@ void Call::warning()
****************************************************************************/
///Input text on the call item
-void Call::appendText(QString str)
+void Call::appendText(const QString& str)
{
QString * editNumber;
diff --git a/kde/src/lib/Call.h b/kde/src/lib/Call.h
index 7016eab4a84eea0b829a4419d2cfef2b8ca7e6e1..76f31180ab3dd5e484417c620b32d7f561197597 100644
--- a/kde/src/lib/Call.h
+++ b/kde/src/lib/Call.h
@@ -134,23 +134,23 @@ public:
static history_state getHistoryStateFromDaemonCallState ( QString daemonCallState, QString daemonCallType );
//Getters
- call_state getState () const;
- QString getCallId () const;
- QString getPeerPhoneNumber () const;
- QString getPeerName () const;
- call_state getCurrentState () const;
- history_state getHistoryState () const;
- bool getRecording () const;
- QString getAccountId () const;
- bool isHistory () const;
- QString getStopTimeStamp () const;
- QString getStartTimeStamp () const;
- QString getCurrentCodecName () const;
- bool isSecure () const;
- bool isConference () const;
- QString getConfId () const;
- QString getTransferNumber () const;
- QString getCallNumber () const;
+ call_state getState () const;
+ const QString& getCallId () const;
+ const QString& getPeerPhoneNumber () const;
+ const QString& getPeerName () const;
+ call_state getCurrentState () const;
+ history_state getHistoryState () const;
+ bool getRecording () const;
+ const QString& getAccountId () const;
+ bool isHistory () const;
+ QString getStopTimeStamp () const;
+ QString getStartTimeStamp () const;
+ QString getCurrentCodecName () const;
+ bool isSecure () const;
+ bool isConference () const;
+ const QString& getConfId () const;
+ const QString& getTransferNumber () const;
+ const QString& getCallNumber () const;
//Automated function
call_state stateChanged(const QString & newState);
@@ -159,31 +159,31 @@ public:
//Setters
void setConference(bool value);
void setConfId(QString value);
- void setTransferNumber(QString number);
- void setCallNumber(QString number);
+ void setTransferNumber(const QString& number);
+ void setCallNumber(const QString& number);
//Mutotors
- void appendText(QString str);
+ void appendText(const QString& str);
void backspaceItemText();
void changeCurrentState(call_state newState);
private:
//Attributes
- QString m_Account;
- QString m_CallId;
- QString m_ConfId;
+ QString m_Account ;
+ QString m_CallId ;
+ QString m_ConfId ;
QString m_PeerPhoneNumber;
- QString m_PeerName;
- history_state m_HistoryState;
- QDateTime* m_pStartTime;
- QDateTime* m_pStopTime;
- QString m_TransferNumber;
- QString m_CallNumber;
+ QString m_PeerName ;
+ history_state m_HistoryState ;
+ QDateTime* m_pStartTime ;
+ QDateTime* m_pStopTime ;
+ QString m_TransferNumber ;
+ QString m_CallNumber ;
static ContactBackend* m_pContactBackend;
- bool m_isConference;
- call_state m_CurrentState;
- bool m_Recording;
+ bool m_isConference ;
+ call_state m_CurrentState ;
+ bool m_Recording ;
//Automate attributes
/**
diff --git a/kde/src/lib/CallModel.h b/kde/src/lib/CallModel.h
index b72a82939bbfe9cdc38a8aa8d81cb3f93bf6d63d..44f76fd3ef8a7aa2b156330f7d46920bbc826c47 100644
--- a/kde/src/lib/CallModel.h
+++ b/kde/src/lib/CallModel.h
@@ -51,11 +51,11 @@ public:
virtual bool changeConference ( const QString &confId, const QString &state ) = 0;
virtual void removeConference ( const QString &confId ) = 0;
virtual Call* addConference ( const QString &confID ) = 0;
- virtual Call* findCallByCallId ( QString callId ) = 0;
+ virtual Call* findCallByCallId ( const QString& callId ) = 0;
virtual Call* addRingingCall ( const QString& callId ) = 0;
virtual Call* addIncomingCall ( const QString& callId ) = 0;
virtual Call* addCall ( Call* call , Call* parent =0 );
- virtual Call* getCall ( const QString callId ) const = 0;
+ virtual Call* getCall ( const QString& callId ) const = 0;
public slots:
void on1_callStateChanged ( const QString& callID , const QString &state );
void on1_incomingCall ( const QString& accountID , const QString & callID );
@@ -127,42 +127,42 @@ class LIB_EXPORT CallModel : public CallModelBase {
static const QStringList getHistoryCallId ();
//Account related
- static Account* getCurrentAccount ( );
- static QString getCurrentAccountId ( );
- static AccountList* getAccountList ( );
- static QString getPriorAccoundId ( );
- static void setPriorAccountId ( QString value );
+ static Account* getCurrentAccount ( );
+ static QString getCurrentAccountId ( );
+ static AccountList* getAccountList ( );
+ static QString getPriorAccoundId ( );
+ static void setPriorAccountId (const QString& value );
//Connection related
static bool init();
//Magic dispatcher
- Call* findCallByCallId( QString callId );
- CallList getCalls ( );
- CallList getCalls ( const CallWidget widget) const;
- CallList getCalls ( const QString callId ) const;
- CallList getCalls ( const Call* call ) const;
- CallList getCalls ( const Index idx ) const;
+ Call* findCallByCallId( const QString& callId );
+ CallList getCalls ( );
+ CallList getCalls ( const CallWidget widget ) const;
+ CallList getCalls ( const QString& callId ) const;
+ CallList getCalls ( const Call* call ) const;
+ CallList getCalls ( const Index idx ) const;
- bool isConference ( const Call* call ) const;
- bool isConference ( const QString callId ) const;
- bool isConference ( const Index idx ) const;
- bool isConference ( const CallWidget widget) const;
+ bool isConference ( const Call* call ) const;
+ bool isConference ( const QString& callId ) const;
+ bool isConference ( const Index idx ) const;
+ bool isConference ( const CallWidget widget ) const;
- Call* getCall ( const QString callId ) const;
- Call* getCall ( const Index idx ) const;
- Call* getCall ( const Call* call ) const;
- Call* getCall ( const CallWidget widget) const;
+ Call* getCall ( const QString& callId ) const;
+ Call* getCall ( const Index idx ) const;
+ Call* getCall ( const Call* call ) const;
+ Call* getCall ( const CallWidget widget ) const;
- Index getIndex ( const Call* call ) const;
- Index getIndex ( const Index idx ) const;
- Index getIndex ( const CallWidget widget) const;
- Index getIndex ( const QString callId ) const;
+ Index getIndex ( const Call* call ) const;
+ Index getIndex ( const Index idx ) const;
+ Index getIndex ( const CallWidget widget ) const;
+ Index getIndex ( const QString& callId ) const;
- CallWidget getWidget ( const Call* call ) const;
- CallWidget getWidget ( const Index idx ) const;
- CallWidget getWidget ( const CallWidget widget) const;
- CallWidget getWidget ( const QString getWidget) const;
+ CallWidget getWidget ( const Call* call ) const;
+ CallWidget getWidget ( const Index idx ) const;
+ CallWidget getWidget ( const CallWidget widget ) const;
+ CallWidget getWidget ( const QString& getWidget) const;
bool updateIndex ( Call* call, Index value );
bool updateWidget ( Call* call, CallWidget value );
diff --git a/kde/src/lib/CallModel.hpp b/kde/src/lib/CallModel.hpp
index b212c5e170b72d31a12ba417d8b1618e0acb7288..c138ea263b0ea9eb79198cc2ca09c1ac3251447d 100644
--- a/kde/src/lib/CallModel.hpp
+++ b/kde/src/lib/CallModel.hpp
@@ -155,7 +155,7 @@ template<typename CallWidget, typename Index> int CallModel<CallWidget,Index>::s
}
///Return a call corresponding to this ID or NULL
-template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>::findCallByCallId(QString callId)
+template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>::findCallByCallId(const QString& callId)
{
return m_sActiveCalls[callId];
}
@@ -446,7 +446,7 @@ template<typename CallWidget, typename Index> QString CallModel<CallWidget,Index
}
///Set the previous account used
-template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::setPriorAccountId(QString value) {
+template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::setPriorAccountId(const QString& value) {
m_sPriorAccountId = value;
}
@@ -555,7 +555,7 @@ template<typename CallWidget, typename Index> QList<Call*> CallModel<CallWidget,
}
///Is the call associated with that ID a conference
-template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::isConference ( const QString callId ) const
+template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::isConference ( const QString& callId ) const
{
if (m_sPrivateCallList_callId[callId]) {
return m_sPrivateCallList_callId[callId]->conference;
@@ -564,7 +564,7 @@ template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::
}
///Get the call associated with this ID
-template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>::getCall ( const QString callId ) const
+template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>::getCall ( const QString& callId ) const
{
if (m_sPrivateCallList_callId[callId]) {
return m_sPrivateCallList_callId[callId]->call_real;
@@ -573,7 +573,7 @@ template<typename CallWidget, typename Index> Call* CallModel<CallWidget,Index>:
}
///Get the calls associated with this ID
-template<typename CallWidget, typename Index> QList<Call*> CallModel<CallWidget,Index>::getCalls ( const QString callId ) const
+template<typename CallWidget, typename Index> QList<Call*> CallModel<CallWidget,Index>::getCalls ( const QString& callId ) const
{
QList<Call*> toReturn;
if (m_sPrivateCallList_callId[callId] && m_sPrivateCallList_callId[callId]->conference) {
@@ -612,7 +612,7 @@ template<typename CallWidget, typename Index> Index CallModel<CallWidget,Index>:
}
///Get the index associated with this ID
-template<typename CallWidget, typename Index> Index CallModel<CallWidget,Index>::getIndex ( const QString callId ) const
+template<typename CallWidget, typename Index> Index CallModel<CallWidget,Index>::getIndex ( const QString& callId ) const
{
if (m_sPrivateCallList_callId[callId]) {
return m_sPrivateCallList_callId[callId]->index;
@@ -648,7 +648,7 @@ template<typename CallWidget, typename Index> CallWidget CallModel<CallWidget,In
}
///Get the widget associated with this ID
-template<typename CallWidget, typename Index> CallWidget CallModel<CallWidget,Index>::getWidget ( const QString widget ) const
+template<typename CallWidget, typename Index> CallWidget CallModel<CallWidget,Index>::getWidget ( const QString& widget ) const
{
if (m_sPrivateCallList_widget[widget]) {
return m_sPrivateCallList_widget[widget]->call;
diff --git a/kde/src/lib/Contact.cpp b/kde/src/lib/Contact.cpp
index fd45d1b193a55411c75b76c23159e785039d0e16..557cf07abd25d3a93a8561225769028204f75953 100644
--- a/kde/src/lib/Contact.cpp
+++ b/kde/src/lib/Contact.cpp
@@ -60,19 +60,19 @@ PhoneNumbers Contact::getPhoneNumbers() const
}
///Get the nickname
-QString Contact::getNickName() const
+const QString& Contact::getNickName() const
{
return m_NickName;
}
///Get the firstname
-QString Contact::getFirstName() const
+const QString& Contact::getFirstName() const
{
return m_FirstName;
}
///Get the second/family name
-QString Contact::getSecondName() const
+const QString& Contact::getSecondName() const
{
return m_SecondName;
}
@@ -84,31 +84,31 @@ const QPixmap* Contact::getPhoto() const
}
///Get the formatted name
-QString Contact::getFormattedName() const
+const QString& Contact::getFormattedName() const
{
return m_FormattedName;
}
///Get the organisation
-QString Contact::getOrganization() const
+const QString& Contact::getOrganization() const
{
return m_Organization;
}
///Get the preferred email
-QString Contact::getPreferredEmail() const
+const QString& Contact::getPreferredEmail() const
{
return m_PreferredEmail;
}
///Get the unique identifier (used for drag and drop)
-QString Contact::getUid() const
+const QString& Contact::getUid() const
{
return m_Uid;
}
///Get the contact type
-QString Contact::getType() const
+const QString& Contact::getType() const
{
return m_Type;
}
@@ -120,19 +120,19 @@ void Contact::setPhoneNumbers(PhoneNumbers numbers)
}
///Set the nickname
-void Contact::setNickName(QString name)
+void Contact::setNickName(const QString& name)
{
m_NickName = name;
}
///Set the first name
-void Contact::setFirstName(QString name)
+void Contact::setFirstName(const QString& name)
{
m_FirstName = name;
}
///Set the family name
-void Contact::setFamilyName(QString name)
+void Contact::setFamilyName(const QString& name)
{
m_SecondName = name;
}
@@ -144,25 +144,25 @@ void Contact::setPhoto(QPixmap* photo)
}
///Set the formatted name (display name)
-void Contact::setFormattedName(QString name)
+void Contact::setFormattedName(const QString& name)
{
m_FormattedName = name;
}
///Set the organisation / business
-void Contact::setOrganization(QString name)
+void Contact::setOrganization(const QString& name)
{
m_Organization = name;
}
///Set the default email
-void Contact::setPreferredEmail(QString name)
+void Contact::setPreferredEmail(const QString& name)
{
m_PreferredEmail = name;
}
///Set UID
-void Contact::setUid(QString id)
+void Contact::setUid(const QString& id)
{
m_Uid = id;
}
\ No newline at end of file
diff --git a/kde/src/lib/Contact.h b/kde/src/lib/Contact.h
index 133b466a1e29cf88b682ed1f353cb7b068408a43..87fa55c9023e992099312e2c9beeb77816c8730d 100644
--- a/kde/src/lib/Contact.h
+++ b/kde/src/lib/Contact.h
@@ -83,27 +83,27 @@ public:
virtual void initItem();
//Getters
- virtual PhoneNumbers getPhoneNumbers() const;
- virtual QString getNickName() const;
- virtual QString getFirstName() const;
- virtual QString getSecondName() const;
- virtual QString getFormattedName() const;
- virtual QString getOrganization() const;
- virtual QString getUid() const;
- virtual QString getPreferredEmail() const;
- virtual const QPixmap* getPhoto() const;
- virtual QString getType() const;
+ virtual PhoneNumbers getPhoneNumbers() const;
+ virtual const QString& getNickName() const;
+ virtual const QString& getFirstName() const;
+ virtual const QString& getSecondName() const;
+ virtual const QString& getFormattedName() const;
+ virtual const QString& getOrganization() const;
+ virtual const QString& getUid() const;
+ virtual const QString& getPreferredEmail() const;
+ virtual const QPixmap* getPhoto() const;
+ virtual const QString& getType() const;
//Setters
- virtual void setPhoneNumbers (PhoneNumbers );
- virtual void setFormattedName (QString name );
- virtual void setNickName (QString name );
- virtual void setFirstName (QString name );
- virtual void setFamilyName (QString name );
- virtual void setOrganization (QString name );
- virtual void setPreferredEmail (QString name );
- virtual void setUid (QString id );
- virtual void setPhoto (QPixmap* photo );
+ virtual void setPhoneNumbers (PhoneNumbers );
+ virtual void setFormattedName (const QString& name );
+ virtual void setNickName (const QString& name );
+ virtual void setFirstName (const QString& name );
+ virtual void setFamilyName (const QString& name );
+ virtual void setOrganization (const QString& name );
+ virtual void setPreferredEmail (const QString& name );
+ virtual void setUid (const QString& id );
+ virtual void setPhoto (QPixmap* photo );
protected:
virtual void initItemWidget();
diff --git a/kde/src/lib/ContactBackend.h b/kde/src/lib/ContactBackend.h
index 518bb7282b5d28898c25f6a7db63777f5f15bba7..81a0c051d2e8c3b4d291530e8d1fe4afdc579ae1 100644
--- a/kde/src/lib/ContactBackend.h
+++ b/kde/src/lib/ContactBackend.h
@@ -37,10 +37,10 @@ class LIB_EXPORT ContactBackend : public QObject {
Q_OBJECT
public:
ContactBackend(QObject* parent);
- virtual Contact* getContactByPhone ( QString phoneNumber ) = 0;
- virtual Contact* getContactByUid ( QString uid ) = 0;
- virtual void editContact ( Contact* contact ) = 0;
- virtual void addNewContact ( Contact* contact ) = 0;
+ virtual Contact* getContactByPhone ( const QString& phoneNumber ) = 0;
+ virtual Contact* getContactByUid ( const QString& uid ) = 0;
+ virtual void editContact ( Contact* contact ) = 0;
+ virtual void addNewContact ( Contact* contact ) = 0;
protected:
virtual ContactList update_slot ( ) = 0;
QHash<QString,Contact*> m_ContactByPhone ;
diff --git a/kde/src/widgets/AccountItemWidget.cpp b/kde/src/widgets/AccountItemWidget.cpp
index c61af62ee242eebc0e88c0661c8278f67767c03a..0b427239454c95b9a6e3129443dede24247324f0 100755
--- a/kde/src/widgets/AccountItemWidget.cpp
+++ b/kde/src/widgets/AccountItemWidget.cpp
@@ -124,7 +124,7 @@ void AccountItemWidget::setEnabled(bool enabled)
}
///Set the widget text
-void AccountItemWidget::setAccountText(QString text)
+void AccountItemWidget::setAccountText(const QString& text)
{
this->m_pTextLabel->setText(text);
}
diff --git a/kde/src/widgets/AccountItemWidget.h b/kde/src/widgets/AccountItemWidget.h
index 1eb0505394cd5ddf8557ce845287165b928d52a6..e2d1659a8cac2502667bc231c07c894a3f82da99 100755
--- a/kde/src/widgets/AccountItemWidget.h
+++ b/kde/src/widgets/AccountItemWidget.h
@@ -45,9 +45,9 @@ public:
bool getEnabled();
//Setters
- void setState (int state );
- void setEnabled (bool enabled );
- void setAccountText (QString text );
+ void setState (int state );
+ void setEnabled (bool enabled );
+ void setAccountText (const QString& text );
//Updates
void updateStateDisplay ();
diff --git a/kde/src/widgets/BookmarkDock.cpp b/kde/src/widgets/BookmarkDock.cpp
index 59d608280de3812c98469f51a301037672cfbd75..1d255a012b50d6b0efae48001e4366c8825216aa 100644
--- a/kde/src/widgets/BookmarkDock.cpp
+++ b/kde/src/widgets/BookmarkDock.cpp
@@ -103,7 +103,7 @@ BookmarkDock::~BookmarkDock()
****************************************************************************/
///Add a new bookmark
-void BookmarkDock::addBookmark_internal(QString phone)
+void BookmarkDock::addBookmark_internal(const QString& phone)
{
HistoryTreeItem* widget = new HistoryTreeItem(m_pItemView,phone);
QTreeWidgetItem* item = new QTreeWidgetItem(m_pItemView );
@@ -114,7 +114,7 @@ void BookmarkDock::addBookmark_internal(QString phone)
}
///Proxy to add a new bookmark
-void BookmarkDock::addBookmark(QString phone)
+void BookmarkDock::addBookmark(const QString& phone)
{
addBookmark_internal(phone);
ConfigurationSkeleton::setBookmarkList(ConfigurationSkeleton::bookmarkList() << phone);
diff --git a/kde/src/widgets/BookmarkDock.h b/kde/src/widgets/BookmarkDock.h
index 8d3898b777c42479a1635d35f129f14b9ea88c1b..f55fc30347bdf81c7db485e5ce9187f3b9ab0aaa 100644
--- a/kde/src/widgets/BookmarkDock.h
+++ b/kde/src/widgets/BookmarkDock.h
@@ -44,7 +44,7 @@ public:
virtual ~BookmarkDock();
//Mutators
- void addBookmark(QString phone);
+ void addBookmark(const QString& phone);
private:
//Attributes
QTreeWidget* m_pItemView;
@@ -53,7 +53,7 @@ private:
BookmarkList m_pBookmark;
//Mutators
- void addBookmark_internal(QString phone);
+ void addBookmark_internal(const QString& phone);
private slots:
void filter(QString text);
};
diff --git a/kde/src/widgets/ContactDock.cpp b/kde/src/widgets/ContactDock.cpp
index 40754ec1e083401173b00f2d281c1344f45cfd2a..d7f408bbd1411ac3cfd1b28fe14e1ccedf6a0ebd 100644
--- a/kde/src/widgets/ContactDock.cpp
+++ b/kde/src/widgets/ContactDock.cpp
@@ -202,7 +202,7 @@ void ContactDock::loadContactHistory(QTreeWidgetItem* item)
}
///Filter contact
-void ContactDock::filter(QString text)
+void ContactDock::filter(const QString& text)
{
foreach(ContactItemWidget* item, m_Contacts) {
bool foundNumber = false;
diff --git a/kde/src/widgets/ContactDock.h b/kde/src/widgets/ContactDock.h
index fd503c98a5ab80fd91f8306dc991a1a9f495074d..014d89152021713c6c55558e206ec5540faa94d5 100644
--- a/kde/src/widgets/ContactDock.h
+++ b/kde/src/widgets/ContactDock.h
@@ -75,7 +75,7 @@ public slots:
private slots:
void reloadContact();
void loadContactHistory(QTreeWidgetItem* item);
- void filter(QString text);
+ void filter(const QString& text);
void setHistoryVisible(bool visible);
};
diff --git a/kde/src/widgets/ContactItemWidget.cpp b/kde/src/widgets/ContactItemWidget.cpp
index 3ded9272df1b59f85d56e8f176bf083143029b4a..ae2537980e90635f74123907acd0cf91632de779 100644
--- a/kde/src/widgets/ContactItemWidget.cpp
+++ b/kde/src/widgets/ContactItemWidget.cpp
@@ -195,7 +195,7 @@ void ContactItemWidget::updated()
****************************************************************************/
///Return contact name
-QString ContactItemWidget::getContactName() const
+const QString& ContactItemWidget::getContactName() const
{
return m_pContactKA->getFormattedName();
}
@@ -207,13 +207,13 @@ PhoneNumbers ContactItemWidget::getCallNumbers() const
}
///Return the organisation
-QString ContactItemWidget::getOrganization() const
+const QString& ContactItemWidget::getOrganization() const
{
return m_pContactKA->getOrganization();
}
///Return the email address
-QString ContactItemWidget::getEmail() const
+const QString& ContactItemWidget::getEmail() const
{
return m_pContactKA->getPreferredEmail();
}
@@ -225,13 +225,13 @@ QPixmap* ContactItemWidget::getPicture() const
}
///Return the model index
-QTreeWidgetItem* ContactItemWidget::getItem()
+QTreeWidgetItem* ContactItemWidget::getItem() const
{
return m_pItem;
}
///Return the contact object
-Contact* ContactItemWidget::getContact()
+Contact* ContactItemWidget::getContact() const
{
return m_pContactKA;
}
diff --git a/kde/src/widgets/ContactItemWidget.h b/kde/src/widgets/ContactItemWidget.h
index bddd29b5c9acb9be40a323f9e41051add52fd74f..fbbe3be35615be304ca6c53da08ec921a242a5b8 100644
--- a/kde/src/widgets/ContactItemWidget.h
+++ b/kde/src/widgets/ContactItemWidget.h
@@ -50,14 +50,14 @@ class ContactItemWidget : public QWidget
~ContactItemWidget();
//Getters
- KABC::Addressee* contact() const;
- QString getContactName() const;
- PhoneNumbers getCallNumbers() const;
- QString getOrganization() const;
- QString getEmail() const;
- QPixmap* getPicture() const;
- QTreeWidgetItem* getItem() ;
- Contact* getContact() ;
+ KABC::Addressee* contact() const;
+ const QString& getContactName() const;
+ PhoneNumbers getCallNumbers() const;
+ const QString& getOrganization() const;
+ const QString& getEmail() const;
+ QPixmap* getPicture() const;
+ QTreeWidgetItem* getItem() const;
+ Contact* getContact() const;
//Setters
void setContact ( Contact* contact );
diff --git a/kde/src/widgets/Dialpad.cpp b/kde/src/widgets/Dialpad.cpp
index 8634b1dee180b2ff20dee7a0e6c08e8564c68bdf..1f7d70404a18a4e2e65a2696ec7db83dc0355e21 100755
--- a/kde/src/widgets/Dialpad.cpp
+++ b/kde/src/widgets/Dialpad.cpp
@@ -43,18 +43,18 @@ Dialpad::Dialpad(QWidget *parent)
: QWidget(parent),gridLayout(new QGridLayout(this)),m_pButtons(new DialpadButton*[12])
{
for (uint i=0; i < 12;i++) {
- m_pButtons[i] = new DialpadButton(this,m_pNumbers[i]);
+ m_pButtons[i] = new DialpadButton( this,m_pNumbers[i] );
+ QHBoxLayout* layout = new QHBoxLayout ( m_pButtons[i] );
+ QLabel* number = new QLabel ( m_pNumbers[i] );
+ QLabel* text = new QLabel ( m_pTexts[i] );
+ m_pButtons[i]->setMinimumHeight(30);
gridLayout->addWidget(m_pButtons[i],i/3,i%3);
- QHBoxLayout* layout = new QHBoxLayout(m_pButtons[i]);
- layout->setSpacing(m_Spacing);
- QLabel* number = new QLabel(m_pNumbers[i]);
number->setFont(QFont("", m_NumberSize));
- layout->addWidget(number);
number->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
- QLabel* text = new QLabel(m_pTexts[i]);
text->setFont(QFont("", m_TextSize));
- layout->addWidget(text);
- m_pButtons[i]->setMinimumHeight(30);
+ layout->setSpacing ( m_Spacing );
+ layout->addWidget ( number );
+ layout->addWidget ( text );
connect(m_pButtons[i],SIGNAL(typed(QString&)),this,SLOT(clicked(QString&)));
}
}