Remove or comment unnecessary/unhelpful debug output

kde/src/AkonadiBackend.cpp

@@ -88,8 +88,6 @@ ContactList AkonadiBackend::update(Akonadi::Collection collection)
          }
       }
    }
-
-   qDebug() << "End collect "<< contacts.size() << "\n\n\n";
    return contacts;
 }
 
@@ -112,7 +110,6 @@ Contact* AkonadiBackend::getContactByUid(QString uid)
 void AkonadiBackend::collectionsReceived( const Akonadi::Collection::List&  list)
 {
    foreach (Akonadi::Collection coll, list) {
-      qDebug() << "\n\n\n\n\n\nLoading collection" << coll.name();
       update(coll);
       emit collectionChanged();
    }

kde/src/CallView.cpp

@@ -175,9 +175,7 @@ bool CallView::contactToCall(QTreeWidgetItem *parent, int index, const QMimeData
    QByteArray encodedContact = data->data( MIME_CONTACT );
    if (!QString(encodedContact).isEmpty()) {
       Contact* contact = AkonadiBackend::getInstance()->getContactByUid(encodedContact);
-      qDebug() << "Contact:" << contact;
       if (contact) {
-         qDebug() << "In contact";
          Call* call2;
          if (contact->getPhoneNumbers().count() == 1) {
             call2 = TreeWidgetCallModel::addDialingCall(contact->getFormattedName(), TreeWidgetCallModel::getCurrentAccountId());
@@ -265,11 +263,9 @@ QMimeData* CallView::mimeData( const QList<QTreeWidgetItem *> items) const
    
    //Call ID for internal call merging and spliting
    if (getCall(items[0])->isConference()) {
-      qDebug() << "Conf id:" << getCall(items[0])->getConfId().toAscii();
       mimeData->setData(MIME_CALLID, getCall(items[0])->getConfId().toAscii());
    }
    else {
-      qDebug() << "Call id:" << getCall(items[0])->getConfId().toAscii();
       mimeData->setData(MIME_CALLID, getCall(items[0])->getCallId().toAscii());
    }
    

kde/src/SFLPhoneView.cpp

@@ -166,7 +166,6 @@ void SFLPhoneView::saveState()
 
 void SFLPhoneView::loadWindow()
 {
-   qDebug() << "\nloadWindow";
    updateWindowCallState();
    updateRecordButton();
    updateVolumeButton();
@@ -178,7 +177,6 @@ void SFLPhoneView::loadWindow()
    updateAddressBookEnabled();
    updateAddressBook();
    updateStatusMessage();
-   qDebug() << "Finished loadWindow\n";
 }
 
 QErrorMessage * SFLPhoneView::getErrorWindow()
@@ -217,7 +215,6 @@ void SFLPhoneView::addContactToContactList(Contact * contact)
 
 void SFLPhoneView::typeString(QString str)
 {
-   qDebug() << "typeString";
    CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
    
    if(stackedWidget_screen->currentWidget() == page_callList) {
@@ -301,7 +298,7 @@ void SFLPhoneView::escape()
       qDebug() << "In call list.";
       Call* call = callTreeModel->getCurrentItem();
       if(!call) {
-         qDebug() << "Escape when no item is selected. Doing nothing.";
+         //qDebug() << "Escape when no item is selected. Doing nothing.";
       }
       else {
          if(call->getState() == CALL_STATE_TRANSFER || call->getState() == CALL_STATE_TRANSF_HOLD) {
@@ -564,9 +561,7 @@ void SFLPhoneView::updateCallHistory()
    }
    QString textSearched = lineEdit_searchHistory->text();
    foreach (Call* call, historyTreeModel->getCallList()) {
-      qDebug() << "" << call->getCallId();
       if( call->getState() == CALL_STATE_OVER && call->getHistoryState() != NONE && (call->getPeerPhoneNumber().contains(textSearched) || call->getPeerName().contains(textSearched)) ) {
-         qDebug() << "call->getPeerPhoneNumber()=" << call->getPeerPhoneNumber() << " contains textSearched=" << textSearched;
          //addCallToCallHistory(call);
          historyTreeModel->addCall(call);
       }

kde/src/conf/dlgaccounts.h

@@ -41,6 +41,7 @@ struct CredentialData {
 };
 
 typedef QHash<QListWidgetItem*, CredentialData> QListWidgetItemHash; //Needed to fix a Qt foreach macro argument parsing bug
+typedef QList<CredentialData> CredentialList;
 
 class Private_AddCodecDialog : public KDialog {
   Q_OBJECT
@@ -60,8 +61,6 @@ class Private_AddCodecDialog : public KDialog {
           codecTable->setItem(i,1,cBitrate);
           QTableWidgetItem* cFrequency = new  QTableWidgetItem(aCodec["frequency"]);
           codecTable->setItem(i,2,cFrequency);
-          QTableWidgetItem* cBandwidth = new  QTableWidgetItem(aCodec["bandwidth"]);
-          codecTable->setItem(i,3,cBandwidth);
           QTableWidgetItem* cAlias = new  QTableWidgetItem(aCodec["alias"]);
           codecTable->setItem(i,4,cAlias);
           i++;
@@ -111,9 +110,10 @@ public:
    void loadAccount(QListWidgetItem * item);
    
 private:
-   ConfigAccountList* accountList;
-   QList<StringHash> codecList;
+   ConfigAccountList*  accountList;
+   QList<StringHash>   codecList;
    QListWidgetItemHash credentialInfo;
+   CredentialList      credentialList;
    bool accountListHasChanged;
    void loadCodecList();
 

kde/src/lib/Call.cpp

@@ -673,7 +673,7 @@ void Call::backspaceItemText()
 
 void Call::changeCurrentState(call_state newState)
 {
-   qDebug() << "Call state changed to: " << newState;
+   //qDebug() << "Call state changed to: " << newState;
    currentState = newState;
 
    emit changed();

kde/src/lib/CallModel.hpp

@@ -73,10 +73,8 @@ template<typename CallWidget, typename Index> bool CallModel<CallWidget,Index>::
    if (!historyInit) {
       ConfigurationManagerInterface& configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
       QStringList historyMap = configurationManager.getHistory().value();
-      qDebug() << "\n\n\n\n\n\n\n\nCall History = " ;
       foreach (QString historyCallId, historyMap) {
          QStringList param = historyCallId.split("|");
-         qDebug() << "Param count" << param.size();
          if (param.count() <= 10) {
             //If this ever change, look at the gnome client
             QString history_state = param[0];

kde/src/lib/sflphone_const.h

@@ -267,9 +267,7 @@
 #define TLS_NEGOTIATION_TIMEOUT_MSEC        "TLS.negotiationTimemoutMsec"
 
 #define ACCOUNT_ID                         "Account.id"
-#define ACCOUNT_PASSWORD                   "password"
 #define ACCOUNT_AUTHENTICATION_USERNAME    "authenticationUsername"
-#define ACCOUNT_REALM                      "realm"
 #define ACCOUNT_KEY_EXCHANGE               "SRTP.keyExchange"
 #define ACCOUNT_SRTP_ENABLED               "SRTP.enable"
 #define ACCOUNT_SRTP_RTP_FALLBACK          "SRTP.rtpFallback"

kde/src/widgets/CallTreeItem.cpp

@@ -162,7 +162,7 @@ void CallTreeItem::updated()
       }
    }
    else {
-      qDebug() << "Updating item of call of state OVER. Doing nothing.";
+      //qDebug() << "Updating item of call of state OVER. Doing nothing.";
    }
    
 }

kde/src/widgets/HistoryTreeItem.cpp

@@ -164,9 +164,6 @@ void HistoryTreeItem::updated()
          labelCallNumber2->setText(itemCall->getCallNumber());
       }
    }
-   else {
-      qDebug() << "Updating item of call of state OVER. Doing nothing.";
-   }
    
 }