Changeset 666:2852829a2283 in qutecom-2.2

Timestamp:

Sep 29, 2010 11:02:24 AM (3 years ago)

Author:

laurent, Dmitriy.Trt

Branch:

default

Message:

utf8 support

Location:

qutecom/src/presentation

Files:

• main.cpp (modified) (2 diffs)
• qt/QtAbout.cpp (modified) (1 diff)
• qt/QtBrowserWidget.cpp (modified) (2 diffs)
• qt/QtDialpad.cpp (modified) (3 diffs)
• qt/QtEnumIMProtocol.cpp (modified) (1 diff)
• qt/QtFactory.cpp (modified) (2 diffs)
• qt/QtHttpProxyLogin.cpp (modified) (2 diffs)
• qt/QtIMAccountMonitor.cpp (modified) (8 diffs)
• qt/QtLanguage.cpp (modified) (8 diffs)
• qt/QtPresencePixmapHelper.cpp (modified) (2 diffs)
• qt/QtQuteCom.cpp (modified) (7 diffs)
• qt/QtSVGDialpad.cpp (modified) (2 diffs)
• qt/QtSystray.cpp (modified) (3 diffs)
• qt/QtToolBar.cpp (modified) (1 diff)
• qt/callbar/QtCallBar.cpp (modified) (2 diffs)
• qt/callbar/QtPhoneComboBox.cpp (modified) (1 diff)
• qt/chat/QtChatEditWidget.cpp (modified) (2 diffs)
• qt/chat/QtChatHandler.cpp (modified) (1 diff)
• qt/chat/QtChatHistoryWidget.cpp (modified) (7 diffs)
• qt/chat/QtChatLogViewer.cpp (modified) (11 diffs)
• qt/chat/QtChatWidget.cpp (modified) (14 diffs)
• qt/chat/QtChatWindow.cpp (modified) (17 diffs)
• qt/chat/chatroom/QtChatRoomInviteDlg.cpp (modified) (3 diffs)
• qt/chat/emoticons/QtEmoticonsManager.cpp (modified) (2 diffs)
• qt/conference/QtConferenceCallWidget.cpp (modified) (2 diffs)
• qt/config/QtAdvancedConfig.cpp (modified) (4 diffs)
• qt/config/QtAppearanceSettings.cpp (modified) (2 diffs)
• qt/config/QtAudioSettings.cpp (modified) (8 diffs)
• qt/config/QtCallForwardSettings.cpp (modified) (2 diffs)
• qt/config/QtLanguagesSettings.cpp (modified) (2 diffs)
• qt/config/QtNotificationSettings.cpp (modified) (4 diffs)
• qt/config/QtQuteComConfigDialog.cpp (modified) (1 diff)
• qt/config/QtVideoSettings.cpp (modified) (2 diffs)
• qt/config/QtVoicemailSettings.cpp (modified) (2 diffs)
• qt/contactlist/ContactGroupPopupMenu.cpp (modified) (1 diff)
• qt/contactlist/QtContact.cpp (modified) (4 diffs)
• qt/contactlist/QtContactList.cpp (modified) (7 diffs)
• qt/contactlist/QtContactManager.cpp (modified) (12 diffs)
• qt/contactlist/QtContactMenu.cpp (modified) (6 diffs)
• qt/contactlist/QtContactTreeMouseFilter.cpp (modified) (2 diffs)
• qt/contactlist/QtContactWidget.cpp (modified) (6 diffs)
• qt/contactlist/QtTreeViewDelegate.cpp (modified) (2 diffs)
• qt/filetransfer/QtFileTransfer.cpp (modified) (5 diffs)
• qt/filetransfer/QtFileTransferDownloadItem.cpp (modified) (1 diff)
• qt/filetransfer/QtFileTransferItem.cpp (modified) (2 diffs)
• qt/filetransfer/QtFileTransferUploadItem.cpp (modified) (1 diff)
• qt/filetransfer/QtFileTransferWidget.cpp (modified) (2 diffs)
• qt/history/QtHistory.cpp (modified) (4 diffs)
• qt/imaccount/QtAIMSettings.cpp (modified) (1 diff)
• qt/imaccount/QtFaceBookSettings.cpp (modified) (1 diff)
• qt/imaccount/QtGoogleTalkSettings.cpp (modified) (2 diffs)
• qt/imaccount/QtICQSettings.cpp (modified) (1 diff)
• qt/imaccount/QtIMAccountManager.cpp (modified) (5 diffs)
• qt/imaccount/QtJabberSettings.cpp (modified) (4 diffs)
• qt/imaccount/QtMSNSettings.cpp (modified) (3 diffs)
• qt/imaccount/QtMySpaceSettings.cpp (modified) (1 diff)
• qt/imaccount/QtSkypeSettings.cpp (modified) (1 diff)
• qt/imaccount/QtTwitterSettings.cpp (modified) (1 diff)
• qt/imaccount/QtYahooSettings.cpp (modified) (2 diffs)
• qt/imcontact/QtAddIMContact.cpp (modified) (7 diffs)
• qt/imcontact/QtAdvancedIMContactManager.cpp (modified) (3 diffs)
• qt/imcontact/QtSimpleIMContactManager.cpp (modified) (5 diffs)
• qt/login/QtAddAccountUtils.cpp (modified) (1 diff)
• qt/login/QtAddQuteComAccount.cpp (modified) (4 diffs)
• qt/login/QtLogAccount.cpp (modified) (3 diffs)
• qt/phonecall/QtPhoneCall.cpp (modified) (9 diffs)
• qt/phoneline/QtPhoneLine.cpp (modified) (1 diff)
• qt/profile/QtProfileDetails.cpp (modified) (8 diffs)
• qt/profile/QtUserProfile.cpp (modified) (4 diffs)
• qt/profile/QtUserProfileHandler.cpp (modified) (1 diff)
• qt/profilebar/QtIMAccountPresenceMenuManager.cpp (modified) (1 diff)
• qt/profilebar/QtIMProfileWidget.cpp (modified) (10 diffs)
• qt/profilebar/QtProfileBar.cpp (modified) (3 diffs)
• qt/webdirectory/QtWebDirectory.cpp (modified) (2 diffs)
• qt/webservices/sms/QtSms.cpp (modified) (2 diffs)
• qt/webservices/softupdate/QtBrowserSoftUpdate.cpp (modified) (1 diff)
• qt/webservices/softupdate/QtSoftUpdate.cpp (modified) (3 diffs)
• xpcom/tests/MainWindow.cpp (modified) (3 diffs)

qutecom/src/presentation/main.cpp

@@ -290 +290 @@
         SipWrapper* w = factoryHelper._sipFactory->createSipWrapper();
         
-        w->setSipOptions("sip.register_timeout", QString::number(config.getSipRegisterTimeOut()).toStdString());
-        w->setSipOptions("sip.publish_timeout", QString::number(config.getSipPublishTimeOut()).toStdString());
+        w->setSipOptions("sip.register_timeout", std::string(QString::number(config.getSipRegisterTimeOut()).toUtf8()));
+        w->setSipOptions("sip.publish_timeout", std::string(QString::number(config.getSipPublishTimeOut()).toUtf8()));
         if(config.getSipUseOptions())
                 w->setSipOptions("sip.use_options_request", "true");
@@ -375 +375 @@
 
         // Init file system resource engine
-        FSResourceFileEngineHandler handler(QString::fromStdString(config.getResourcesDir()));
+        FSResourceFileEngineHandler handler(QString::fromUtf8(config.getResourcesDir().c_str()));
 
         // CQuteCom creates PQuteCom (QtQuteCom, GtkQuteCom...)

qutecom/src/presentation/qt/QtAbout.cpp

@@ -49 +49 @@
                 _ui->authorsTextEdit->setPlainText(authors);
         } else {
-                LOG_ERROR("couldn't locate file=" + file.fileName().toStdString());
+                LOG_ERROR("couldn't locate file=" + file.fileName().toUtf8());
         }
 

qutecom/src/presentation/qt/QtBrowserWidget.cpp

@@ -54 +54 @@
 
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        base_path = QString::fromStdString(config.getResourcesDir());
+        base_path = QString::fromUtf8(config.getResourcesDir().c_str());
 #if defined (OS_WINDOWS)
         base_path = base_path.replace("\\","/");
@@ -166 +166 @@
         else
         {
-                WebBrowser::openUrl(url.toString().toStdString());
+                WebBrowser::openUrl(std::string(url.toString().toUtf8()));
         }
 }

qutecom/src/presentation/qt/QtDialpad.cpp

@@ -130 +130 @@
                         _cDtmfThemeManager.getDtmfTheme(theme)->getImageFile();
                 
-                _ui->audioSmileysComboBox->addItem(QIcon(QString::fromStdString(icon)), QString::fromStdString(theme), QVariant());
+                _ui->audioSmileysComboBox->addItem(QIcon(QString::fromUtf8(icon.c_str())), QString::fromUtf8(theme.c_str()), QVariant());
 
                 // Ugly workaround to insert a separator after the "default dialpad" entry
@@ -165 +165 @@
 
         _cDtmfThemeManager.playTone(
-                _ui->audioSmileysComboBox->currentText().toStdString(),
+                std::string(_ui->audioSmileysComboBox->currentText().toUtf8()),
                 tone
         );
@@ -226 +226 @@
         }
 
-        LOG_DEBUG(newThemeName.toStdString());
-
-        const DtmfTheme * newTheme = _cDtmfThemeManager.getDtmfTheme(newThemeName.toStdString());
+        LOG_DEBUG(newThemeName.toUtf8());
+
+        const DtmfTheme * newTheme = _cDtmfThemeManager.getDtmfTheme(std::string(newThemeName.toUtf8()));
 
         if (newTheme->getDialpadMode() == DtmfTheme::svg) {

qutecom/src/presentation/qt/QtEnumIMProtocol.cpp

@@ -66 +66 @@
         }
 
-        LOG_FATAL("unknown protocol=" + protocol.toStdString());
+        LOG_FATAL("unknown protocol=" + protocol.toUtf8());
         return IMProtocolUnknown;
 }

qutecom/src/presentation/qt/QtFactory.cpp

@@ -74 +74 @@
         std::string qtPlugins = Path::getApplicationPrivateFrameworksDirPath() +
                 File::convertPathSeparators("plugins/");
-        QCoreApplication::addLibraryPath(QString::fromStdString(qtPlugins));
+        QCoreApplication::addLibraryPath(QString::fromUtf8(qtPlugins.c_str()));
 #else
 
@@ -226 +226 @@
 
 void QtFactory::openUrl(const QUrl& url) {
-        std::string urlString = url.toString().toStdString();
+        std::string urlString(url.toString().toUtf8());
         WebBrowser::openUrl(urlString);
 }

qutecom/src/presentation/qt/QtHttpProxyLogin.cpp

@@ -37 +37 @@
 
         //addressLineEdit
-        _ui->addressLineEdit->setText(QString::fromStdString(proxyAddress));
+        _ui->addressLineEdit->setText(QString::fromUtf8(proxyAddress.c_str()));
 
         //portLineEdit
@@ -44 +44 @@
 
 std::string QtHttpProxyLogin::getLogin() const {
-        return _ui->loginLineEdit->text().toStdString();
+        return std::string(_ui->loginLineEdit->text().toUtf8());
 }
 
 std::string QtHttpProxyLogin::getPassword() const {
-        return _ui->passwordLineEdit->text().toStdString();
+        return std::string(_ui->passwordLineEdit->text().toUtf8());
 }
 
 std::string QtHttpProxyLogin::getProxyAddress() const {
-        return _ui->addressLineEdit->text().toStdString();
+        return std::string(_ui->addressLineEdit->text().toUtf8());
 }
 

qutecom/src/presentation/qt/QtIMAccountMonitor.cpp

@@ -84 +84 @@
                         }
 
-                        QString id = QString::fromStdString(it->getUUID());
+                        QString id = QString::fromUtf8(it->getUUID().c_str());
                         _imAccountInfoMap[id] = info;
                 }
@@ -91 +91 @@
 
 void QtIMAccountMonitor::imAccountAddedEventHandler(std::string imAccountId) {
-        QString id = QString::fromStdString(imAccountId);
+        QString id = QString::fromUtf8(imAccountId.c_str());
 
         std::auto_ptr<IMAccount> imAccount (_cUserProfile->getUserProfile().getIMAccountManager().getIMAccount(imAccountId));
@@ -116 +116 @@
 
 void QtIMAccountMonitor::imAccountRemovedEventHandler(std::string imAccountId) {
-        QString id = QString::fromStdString(imAccountId);
+        QString id = QString::fromUtf8(imAccountId.c_str());
 
         {
@@ -126 +126 @@
 
 void QtIMAccountMonitor::connectedEventHandler(std::string imAccountId) {
-        QString id = QString::fromStdString(imAccountId);
+        QString id = QString::fromUtf8(imAccountId.c_str());
         {
                 QMutexLocker lock(&_imAccountInfoMapMutex);
@@ -136 +136 @@
 
 void QtIMAccountMonitor::disconnectedEventHandler(std::string imAccountId, bool connectionError, std::string reason) {
-        QString id = QString::fromStdString(imAccountId);
+        QString id = QString::fromUtf8(imAccountId.c_str());
         ConnectionState state;
 
@@ -156 +156 @@
 
 void QtIMAccountMonitor::connectionProgressEventHandler(std::string imAccountId, int currentStep, int totalSteps, std::string infoMessage) {
-        QString id = QString::fromStdString(imAccountId);
+        QString id = QString::fromUtf8(imAccountId.c_str());
 
         QString message = tr("%1 (%2/%3)", "%1 is message, %2 is currentStep, %3 is totalSteps")
-                .arg(QString::fromStdString(infoMessage))
+                .arg(QString::fromUtf8(infoMessage.c_str()))
                 .arg(currentStep + 1)
                 .arg(totalSteps);
@@ -174 +174 @@
 
         if (status == EnumPresenceState::MyPresenceStatusOk) {
-                QString id = QString::fromStdString(imAccountId);
+                QString id = QString::fromUtf8(imAccountId.c_str());
                 {
                         QMutexLocker lock(&_imAccountInfoMapMutex);
@@ -186 +186 @@
         QMutexLocker lock(&_imAccountInfoMapMutex);
         if (!_imAccountInfoMap.contains(imAccountId)) {
-                LOG_WARN("no account found with id " + imAccountId.toStdString());
+                LOG_WARN("no account found with id " + imAccountId.toUtf8());
                 return IMAccountInfoAutoPtr();
         }

qutecom/src/presentation/qt/QtLanguage.cpp

@@ -63 +63 @@
                 std::string keyword = *it;
                 std::string value = settings.getStringKeyValue(keyword);
-                hash[QString::fromStdString(keyword)] = QString::fromUtf8(value.c_str());
+                hash[QString::fromUtf8(keyword.c_str())] = QString::fromUtf8(value.c_str());
         }
 
@@ -112 +112 @@
                 }
         } else {
-                localeName = QString::fromStdString(config.getLanguage());
+                localeName = QString::fromUtf8(config.getLanguage().c_str());
         }
         return localeName;
@@ -129 +129 @@
         QString localeName = QtLanguage::getLocaleFileName();
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString langDir = QString::fromStdString(config.getResourcesDir()) + LANG_DIR;
+        QString langDir = QString::fromUtf8(config.getResourcesDir().c_str()) + LANG_DIR;
         if (!localeName.isEmpty()) {
                 return langDir + QDir::separator() + "qtqutecom_" + localeName;
@@ -141 +141 @@
         QString qtTranslationName = getQtLocaleFileName();
 
-        QString langDir = QString::fromStdString(config.getResourcesDir()) + LANG_DIR;
+        QString langDir = QString::fromUtf8(config.getResourcesDir().c_str()) + LANG_DIR;
         bool qtTranslationLoaded = _qtTranslator->load(qtTranslationName, langDir);
 
@@ -150 +150 @@
 #endif
         if (!qtTranslationLoaded) {
-                LOG_INFO("no Qt translation available for locale '" + getLocaleFileName().toStdString() + "'");
+                LOG_INFO("no Qt translation available for locale '" + getLocaleFileName().toUtf8() + "'");
         }
 
-        LOG_DEBUG(getQuteComLocaleFileName().toStdString());
+        LOG_DEBUG(getQuteComLocaleFileName().toUtf8());
         if (!_appTranslator->load(getQuteComLocaleFileName())) {
-                LOG_INFO("no application translation available for locale '" + getLocaleFileName().toStdString() + "'");
+                LOG_INFO("no application translation available for locale '" + getLocaleFileName().toUtf8() + "'");
         }
 }
@@ -176 +176 @@
 
         QStringList languageList;
-        QDir dir(QString::fromStdString(config.getResourcesDir()) + LANG_DIR);
+        QDir dir(QString::fromUtf8(config.getResourcesDir().c_str()) + LANG_DIR);
 
         Q_FOREACH(QFileInfo fileInfo, dir.entryInfoList()) {
@@ -182 +182 @@
                 if (fileInfo.isFile() &&
                         fileInfo.size() &&
-                        (fileInfo.completeSuffix().toStdString() == LANGUAGE_FILE_EXTENSION)) {
+                        (fileInfo.completeSuffix().toUtf8() == LANGUAGE_FILE_EXTENSION)) {
 
                         QString iso639Code = getIso639CodeFromFileName(fileInfo.fileName());
@@ -190 +190 @@
                                 continue;
                         }
-                        std::string language = LanguageList::getLanguageName(iso639Code.toStdString());
+                        std::string language = LanguageList::getLanguageName(std::string(iso639Code.toUtf8()));
                         languageList += QString::fromUtf8(language.c_str());
                 }

qutecom/src/presentation/qt/QtPresencePixmapHelper.cpp

@@ -95 +95 @@
         int newAngle;
 
-        QString presenceString = QString::fromStdString( EnumPresenceState::toString(*it) );
+        QString presenceString = QString::fromUtf8( EnumPresenceState::toString(*it).c_str() );
         QString name = tmpl.arg(presenceString);
         QPixmap out(name);
         if (out.isNull()) {
-                LOG_WARN("Image " + name.toStdString() + " does not exist");
+                LOG_WARN("Image " + name.toUtf8() + " does not exist");
                 return QPixmap();
         }
@@ -105 +105 @@
         ++it;
         for (; it!=end; ++it) {
-                presenceString = QString::fromStdString( EnumPresenceState::toString(*it) );
+                presenceString = QString::fromUtf8( EnumPresenceState::toString(*it).c_str() );
                 QString name = tmpl.arg(presenceString);
                 QPixmap pix(name);
                 if (pix.isNull()) {
-                        LOG_WARN("Image " + name.toStdString() + " does not exist");
+                        LOG_WARN("Image " + name.toUtf8() + " does not exist");
                         continue;
                 }

qutecom/src/presentation/qt/QtQuteCom.cpp

@@ -187 +187 @@
 #ifdef OS_LINUX
         const std::string &applicationIconPath = ConfigManager::getInstance().getCurrentConfig().getApplicationIconPath();
-        _qutecomPhoneWindow->setWindowIcon(QIcon(QString::fromStdString(applicationIconPath)));
+        _qutecomPhoneWindow->setWindowIcon(QIcon(QString::fromUtf8(applicationIconPath.c_str())));
 #endif
 
@@ -232 +232 @@
 void QtQuteCom::loadStyleSheets() {
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QDir dir(QString::fromStdString(config.getResourcesDir()) + CSS_DIR);
+        QDir dir(QString::fromUtf8(config.getResourcesDir().c_str()) + CSS_DIR);
 
         QStringList filters;
@@ -241 +241 @@
                 QFile file(path);
                 if (!file.open(QIODevice::ReadOnly)) {
-                        LOG_WARN("Can't open " + path.toStdString());
+                        LOG_WARN("Can't open " + path.toUtf8());
                         continue;
                 }
@@ -494 +494 @@
                                                                 ConferenceCall * confCall = new ConferenceCall(*phoneLine);
                                                                 confCall->addPhoneCall(*targetCall);
-                                                                confCall->addPhoneNumber(phoneNumber.toStdString());
+                                                                confCall->addPhoneNumber(phoneNumber.toUtf8());
                                                         }
                                                 } else {
@@ -521 +521 @@
         targetCall->setConferenceCall(confCall);
 
-        PhoneCall * phoneCall2 = confCall->getPhoneCall(phoneNumber.toStdString());
+        PhoneCall * phoneCall2 = confCall->getPhoneCall(std::string(phoneNumber.toUtf8()));
 
         QtContactCallListWidget * qtContactCallListWidgetTarget = 0;
@@ -564 +564 @@
         }
 
-        QString address = QString::fromStdString(targetCall->getPeerSipAddress().getSipAddress());
+        QString address = QString::fromUtf8(targetCall->getPeerSipAddress().getSipAddress().c_str());
         
         if(address.contains("@"))
@@ -573 +573 @@
         }
 
-        confCall->addPhoneNumber(address.toStdString());
-        confCall->addPhoneNumber(phoneNumber.toStdString());
+        confCall->addPhoneNumber(std::string(address.toUtf8()));
+        confCall->addPhoneNumber(std::string(phoneNumber.toUtf8()));
         
         if(phoneCall2)

qutecom/src/presentation/qt/QtSVGDialpad.cpp

@@ -73 +73 @@
 
         //new mask
-        _svgMask = new QSvgRenderer(QString::fromStdString(_repertory + "dialpad_mask.svg"), this);
+        _svgMask = new QSvgRenderer(QString::fromUtf8(std::string(_repertory + "dialpad_mask.svg").c_str()), this);
         _mask = new QImage();
 
         //new image
-        _svgimage = new QSvgRenderer(QString::fromStdString(_repertory + "dialpad_image.svg"), this);
+        _svgimage = new QSvgRenderer(QString::fromUtf8(std::string(_repertory + "dialpad_image.svg").c_str()), this);
 
         //reinitialize layer
@@ -92 +92 @@
 void QtSVGDialpad::changeLayerFile(const std::string & newLayerFile) {
         
-        QFile layerFile(QString::fromStdString(_repertory + newLayerFile));
+        QFile layerFile(QString::fromUtf8(std::string(_repertory + newLayerFile).c_str()));
         
         if ( (newLayerFile != _layerFile)  && (layerFile.exists()) ) {

qutecom/src/presentation/qt/QtSystray.cpp

@@ -351 +351 @@
         CQuteCom & cQuteCom = _qtQuteCom->getCQuteCom();
         if (action) {
-                LOG_DEBUG("call=" + action->data().toString().toStdString());
-                cQuteCom.getCUserProfileHandler().getCUserProfile()->makeCall(action->data().toString().toStdString());
+                LOG_DEBUG("call=" + action->data().toString().toUtf8());
+                cQuteCom.getCUserProfileHandler().getCUserProfile()->makeCall(std::string(action->data().toString().toUtf8()));
         } else {
                 LOG_FATAL("QAction cannot be NULL");
@@ -362 +362 @@
                 QtContactListManager * contactListManager = QtContactListManager::getInstance();
                 if (contactListManager) {
-                        LOG_DEBUG("chat=" + action->data().toString().toStdString());
+                        LOG_DEBUG("chat=" + action->data().toString().toUtf8());
                         contactListManager->startChat(action->data().toString());
                 } else {
@@ -399 +399 @@
                 QtContactListManager * contactListManager = QtContactListManager::getInstance();
                 if (contactListManager) {
-                        LOG_DEBUG("sendfile=" + action->data().toString().toStdString());
+                        LOG_DEBUG("sendfile=" + action->data().toString().toUtf8());
                         contactListManager->sendFile(action->data().toString());
                 }

qutecom/src/presentation/qt/QtToolBar.cpp

@@ -589 +589 @@
 
 void QtToolBar::configChangedEventHandler(const std::string & key) {
-        configChanged(QString::fromStdString(key));
+        configChanged(QString::fromUtf8(key.c_str()));
 }
 
 void QtToolBar::slotConfigChanged(QString qkey) {
-        std::string key = qkey.toStdString();
+        std::string key(qkey.toUtf8());
         if (key == Config::VIDEO_ENABLE_KEY || key == Config::VIDEO_WEBCAM_DEVICE_KEY) {
                 updateToggleVideoAction();

qutecom/src/presentation/qt/callbar/QtCallBar.cpp

@@ -115 +115 @@
 
 std::string QtCallBar::getPhoneComboBoxCurrentText() const {
-        return _phoneComboBox->currentText().toStdString();
+        return std::string(_phoneComboBox->currentText().toUtf8());
 }
 
@@ -127 +127 @@
 
 void QtCallBar::setPhoneComboBoxEditText(const std::string & text) {
-        _phoneComboBox->setEditText(QString::fromStdString(text));
+        _phoneComboBox->setEditText(QString::fromUtf8(text.c_str()));
 }
 
 void QtCallBar::addPhoneComboBoxItem(const std::string & text) {
-        _phoneComboBox->insertItem(0, QString::fromStdString(text));
+        _phoneComboBox->insertItem(0, QString::fromUtf8(text.c_str()));
 }
 

qutecom/src/presentation/qt/callbar/QtPhoneComboBox.cpp

@@ -199 +199 @@
                 HistoryMementoCollection * mementos = chistory->getMementos(HistoryMemento::OutgoingCall, 10);
                 Config & config = ConfigManager::getInstance().getCurrentConfig();
-                QString qutecomSuffix = "@" + QString::fromStdString( config.getQuteComRealm() );
+                QString qutecomSuffix = "@" + QString::fromUtf8( config.getQuteComRealm().c_str() );
                 for (HistoryMap::iterator it = mementos->begin(); it != mementos->end(); it++) {
                         HistoryMemento * memento = (*it).second;

qutecom/src/presentation/qt/chat/QtChatEditWidget.cpp

@@ -61 +61 @@
                         qint64 fileSize;
                         QString fileType;
-                        LOG_DEBUG((*i).toLocalFile().toStdString());
+                        LOG_DEBUG((*i).toLocalFile().toUtf8());
                         QFile fileToSend((*i).toLocalFile());
                         QFileInfo fileInfo(fileToSend);
@@ -69 +69 @@
                                 fileType = fileInfo.completeSuffix();
                                 LOG_DEBUG(
-                                        "filename: " + fileName.toStdString() +
+                                                  "filename: " + std::string(fileName.toUtf8()) +
                                         "size: " + String::fromLongLong((long long)fileSize) +
-                                        "type: " + fileType.toStdString()
+                                                  "type: " + std::string(fileType.toUtf8())
                                 );
                                 // TODO add the contact name (qutecom_id)

qutecom/src/presentation/qt/chat/QtChatHandler.cpp

@@ -53 +53 @@
 
 void QtChatHandler::createSession(const QString & imAccountId, IMContactSet & imContactSet) {
-        _cChatHandler.createSession(imAccountId.toStdString(), imContactSet);
+        _cChatHandler.createSession(std::string(imAccountId.toUtf8()), imContactSet);
 }
 

qutecom/src/presentation/qt/chat/QtChatHistoryWidget.cpp

@@ -58 +58 @@
         frame->setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
 
-        QString path = QString::fromStdString(config.getResourcesDir()) + "pics/avatars/default-avatar.png";
+        QString path = QString::fromUtf8(config.getResourcesDir().c_str()) + "pics/avatars/default-avatar.png";
 #if defined(OS_WINDOWS)
         path = path.replace("\\","/");
@@ -91 +91 @@
         
         page()->mainFrame()->addToJavaScriptWindowObject("parent",this);
-        QFile file_base(QString::fromStdString(config.getResourcesDir())+"chat/base.html");
+        QFile file_base(QString::fromUtf8(config.getResourcesDir().c_str())+"chat/base.html");
         file_base.open(QIODevice::ReadOnly);
         
@@ -109 +109 @@
 
         QString filePath = QFileDialog::getSaveFileName(this, tr("Save As"), 
-                QString::fromStdString(config.getLastChatHistorySaveDir()), "HTML (*.htm *.html)");
+                QString::fromUtf8(config.getLastChatHistorySaveDir().c_str()), "HTML (*.htm *.html)");
 
         if(filePath.length() > 0) {
@@ -120 +120 @@
 
                 QFile fileToSave(filePath);
-                config.set(Config::LAST_CHAT_HISTORY_SAVE_DIR_KEY, QFileInfo(fileToSave).absolutePath().toStdString());
+                config.set(Config::LAST_CHAT_HISTORY_SAVE_DIR_KEY, std::string(QFileInfo(fileToSave).absolutePath().toUtf8()));
                 fileToSave.open(QIODevice::WriteOnly);
-                fileToSave.write(contentToSave.toStdString().c_str(), (long long)contentToSave.length());
+                fileToSave.write(contentToSave.toUtf8().data(), (long long)contentToSave.length());
                 fileToSave.close();
         }
@@ -133 +133 @@
                 url = url.remove(_theme->getCurrentThemePath());
 
-        WebBrowser::openUrl(url.toStdString());
+        WebBrowser::openUrl(std::string(url.toUtf8()));
 }
 
@@ -146 +146 @@
                 
                 Config & config = ConfigManager::getInstance().getCurrentConfig();
-                QString lang = QString::fromStdString(config.getTranslationReceived());
+                QString lang = QString::fromUtf8(config.getTranslationReceived().c_str());
                 QString script = QString("translate(\"%1\",\"%2\",\"%3\",\"%4\",\"%5\")").arg(contactId).arg(senderName).arg(text).arg(time.toString()).arg(lang);
                 page ()->currentFrame ()->evaluateJavaScript(script);
@@ -270 +270 @@
 void QtChatHistoryWidget::setAvatarPixmap(const QString& name, const QPixmap& pixmap) 
 {
-        QDir dir(QString::fromStdString(Config::getConfigDir()));
+        QDir dir(QString::fromUtf8(Config::getConfigDir().c_str()));
         
         if(!dir.exists("cache"))

qutecom/src/presentation/qt/chat/QtChatLogViewer.cpp

@@ -79 +79 @@
         Config & config = ConfigManager::getInstance().getCurrentConfig();
         _ui->historyLog->setTranslate(false);
-        _ui->historyLog->setTheme(QString::fromStdString(config.getChatTheme()),QString::fromStdString(config.getChatThemeVariant()));
+        _ui->historyLog->setTheme(QString::fromUtf8(config.getChatTheme().c_str()),QString::fromUtf8(config.getChatThemeVariant().c_str()));
 
         _ui->actionSearchQuteComContact->setVisible(false);
@@ -102 +102 @@
                 HistoryMementoCollection hmc;
                 StringList cuuidList;
-                userProfile->getHistory().loadChatLog(_log.toStdString(), &hmc, &userlogin, &cuuidList);
+                userProfile->getHistory().loadChatLog(std::string(_log.toUtf8()), &hmc, &userlogin, &cuuidList);
                 _cuuidList = StringListConvert::toQStringList(cuuidList);
                 
@@ -111 +111 @@
                 // Set remote user avatars
                 Q_FOREACH(QString uuid, _cuuidList) {
-                        ContactProfile profile = cContactList.getContactProfile(uuid.toStdString());
+                        ContactProfile profile = cContactList.getContactProfile(std::string(uuid.toUtf8()));
 
                         std::string data = profile.getIcon().getData();
@@ -124 +124 @@
                 _ui->historyLog->setProtocol (EnumIMProtocol::IMProtocolAll);
                 Config & config = ConfigManager::getInstance().getCurrentConfig();
-                QString qutecomSuffix = "@" + QString::fromStdString( config.getQuteComRealm() );
+                QString qutecomSuffix = "@" + QString::fromUtf8( config.getQuteComRealm().c_str() );
                 QDate previousDate;
                 for (HistoryMap::iterator it = hmc.begin(); it != hmc.end(); it++) {
@@ -276 +276 @@
                 _ui->actionActionRestartChat->setEnabled(false);
         } else {
-                std::string cuuid = _cuuidList[0].toStdString();
+                std::string cuuid(_cuuidList[0].toUtf8());
                 contactProfile = qtContactList->getCContactList().getContactProfile(cuuid);
                 _ui->actionCallContact->setEnabled(contactProfile.hasCall() && contactProfile.isAvailable());
@@ -290 +290 @@
         if (userProfile->hasQuteComAccount()) {
                 for (QStringList::const_iterator it = _cuuidList.begin(); it != _cuuidList.end(); it++) {
-                        contactProfile = qtContactList->getCContactList().getContactProfile(it->toStdString());
+                        contactProfile = qtContactList->getCContactList().getContactProfile(std::string(it->toUtf8()));
                         sendSMS |= !contactProfile.getMobilePhone().empty();
                         sendFile |= canDoFileTransfer(contactProfile);
@@ -322 +322 @@
                         sms->clear();
                         for (QStringList::const_iterator it = _cuuidList.begin(); it != _cuuidList.end(); it++) {
-                                contactProfile = qtContactList->getCContactList().getContactProfile(it->toStdString());
-                                sms->addPhoneNumber(QString::fromStdString(contactProfile.getMobilePhone()));
+                                contactProfile = qtContactList->getCContactList().getContactProfile(std::string(it->toUtf8()));
+                                sms->addPhoneNumber(QString::fromUtf8(contactProfile.getMobilePhone().c_str()));
                         }
                         sms->getWidget()->show();
@@ -347 +347 @@
         QFileInfo fileInfo(filename);
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        config.set(Config::FILETRANSFER_LASTUPLOADEDFILE_FOLDER_KEY, fileInfo.dir().absolutePath().toStdString());
+        config.set(Config::FILETRANSFER_LASTUPLOADEDFILE_FOLDER_KEY, std::string(fileInfo.dir().absolutePath().toUtf8()));
         ////
         
@@ -357 +357 @@
         
         for (QStringList::const_iterator it = _cuuidList.begin(); it != _cuuidList.end(); it++) {
-                contactProfile = qtContactList->getCContactList().getContactProfile(it->toStdString());
+                contactProfile = qtContactList->getCContactList().getContactProfile(std::string(it->toUtf8()));
                 
                 if (contactProfile.hasAvailableQuteComId()) {
@@ -383 +383 @@
 
         for (QStringList::const_iterator it = _cuuidList.begin(); it != _cuuidList.end(); it++) {
-                contactProfile = cContactList.getContactProfile(it->toStdString());
+                contactProfile = cContactList.getContactProfile(std::string(it->toUtf8()));
 
                 QtProfileDetails qtProfileDetails(
@@ -402 +402 @@
         // starts a "normal" chat
         if (_cuuidList.size() > 0) {
-                _qtQuteCom.getCQuteCom().getCUserProfileHandler().getCUserProfile()->startIM(_cuuidList[0].toStdString());
+                _qtQuteCom.getCQuteCom().getCUserProfileHandler().getCUserProfile()->startIM(std::string(_cuuidList[0].toUtf8()));
         }
         ////

qutecom/src/presentation/qt/chat/QtChatWidget.cpp

@@ -159 +159 @@
         _webView->page()->mainFrame()->addToJavaScriptWindowObject("parent",this);
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QFile file(QString::fromStdString(config.getResourcesDir())+"chat/base.html");
+        QFile file(QString::fromUtf8(config.getResourcesDir().c_str())+"chat/base.html");
         file.open(QIODevice::ReadOnly);
         _webView->setHtml(file.readAll());      
@@ -165 +165 @@
         //load theme
         connect(_ui.chatHistory,SIGNAL(loadFinished(bool)),this,SLOT(htmlLoadFinished(bool)));
-        _ui.chatHistory->setTheme(QString::fromStdString(config.getChatTheme()),QString::fromStdString(config.getChatThemeVariant()));
+        _ui.chatHistory->setTheme(QString::fromUtf8(config.getChatTheme().c_str()),QString::fromUtf8(config.getChatThemeVariant().c_str()));
 }
 
@@ -222 +222 @@
 {
         Config & config = ConfigManager::getInstance().getCurrentConfig();      
-        QString lang = QString::fromStdString(config.getTranslationSent());     
+        QString lang = QString::fromUtf8(config.getTranslationSent().c_str());  
         QString text = html;
         
@@ -272 +272 @@
         std::string contactId = cContactList.findContactThatOwns(imContact);
 
-        /*if (_ui.avatarFrame->getContactIDList().contains(QString::fromStdString(contactId))) {
+        /*if (_ui.avatarFrame->getContactIDList().contains(QString::fromUtf8(contactId))) {
                 LOG_DEBUG("" + imContact.getContactId() + " deja dans la session !");
                 return;
@@ -283 +283 @@
         pixmap.loadFromData((uchar *)data.c_str(), data.size());
         _ui.avatarFrame->addRemoteContact(
-                QString::fromStdString(contactId),
+                QString::fromUtf8(contactId),
                 QString::fromUtf8(profile.getDisplayName().c_str()),
-                QString::fromStdString(imContact.getContactId()),
+                QString::fromUtf8(imContact.getContactId()),
                 pixmap
         );*/
 
-        QString imContactId = QString::fromStdString(imContact.getContactId());
+        QString imContactId = QString::fromUtf8(imContact.getContactId().c_str());
         addStatusMessage(tr("%1 has joined the chat").arg(imContactId));
 }
 
 void QtChatWidget::contactRemovedEventSlot(const IMContact & imContact) {
-        QString imContactId = QString::fromStdString(imContact.getContactId());
+        QString imContactId = QString::fromUtf8(imContact.getContactId().c_str());
         addStatusMessage(tr("%1 has left the chat").arg(imContactId));
 
@@ -300 +300 @@
         CContactList & cContactList = qtContactList->getCContactList();
         std::string contactId = cContactList.findContactThatOwns(imContact);
-        _ui.avatarFrame->removeRemoteContact(QString::fromStdString(contactId));*/
+        _ui.avatarFrame->removeRemoteContact(QString::fromUtf8(contactId));*/
 }
 
@@ -346 +346 @@
         
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString lang = QString::fromStdString(config.getTranslationSent());
+        QString lang = QString::fromUtf8(config.getTranslationSent().c_str());
         QString html = clearHtml(_ui.chatEdit->toHtml());
         
@@ -448 +448 @@
                 if (data.size() > 0) {
                         pixmap.loadFromData((uchar *)data.c_str(), data.size());
-                        _ui.chatHistory->setAvatarPixmap(QString::fromStdString(contactId), pixmap);
+                        _ui.chatHistory->setAvatarPixmap(QString::fromUtf8(contactId.c_str()), pixmap);
                 }
         }
@@ -471 +471 @@
                 QtContactList * qtContactList = _qtQuteCom->getQtContactList();
                 CContactList & cContactList = qtContactList->getCContactList();
-                ContactProfile contactProfile = cContactList.getContactProfile(_contactId.toStdString());
+                ContactProfile contactProfile = cContactList.getContactProfile(std::string(_contactId.toUtf8()));
 
                 if (contactProfile.getFirstQuteComId().empty()) {
@@ -480 +480 @@
 
                         QString hisMess = "<i>";
-                        QString url = QString::fromStdString(config.getCompanyWebSiteUrl());
+                        QString url = QString::fromUtf8(config.getCompanyWebSiteUrl().c_str());
                         hisMess += tr("Your contact wishes to send a file with @company@. ");
                         hisMess += tr("Go to %1 to install it").arg(url);
                         hisMess += "</i>";
-                        _imChatSession->sendMessage(hisMess.toStdString());
+                        _imChatSession->sendMessage(std::string(hisMess.toUtf8()));
                 }
                 return;
@@ -504 +504 @@
         QtContactList * qtContactList = _qtQuteCom->getQtContactList();
         CContactList & cContactList = qtContactList->getCContactList();
-        ContactProfile profile = cContactList.getContactProfile(_contactId.toStdString());
+        ContactProfile profile = cContactList.getContactProfile(std::string(_contactId.toUtf8()));
 
         QString contactName;
@@ -526 +526 @@
         /*QtContactList * qtContactList = _qtQuteCom->getQtContactList();
         CContactList & cContactList = qtContactList->getCContactList();
-        ContactProfile profile = cContactList.getContactProfile(contactId.toStdString());
+        ContactProfile profile = cContactList.getContactProfile(contactId.toUtf8());
         std::string data = profile.getIcon().getData();
         QPixmap pixmap;
         pixmap.loadFromData((uchar *)data.c_str(), data.size());
-        _ui.avatarFrame->updateContact(contactId, pixmap, QString::fromStdString(profile.getDisplayName()));*/
+        _ui.avatarFrame->updateContact(contactId, pixmap, QString::fromUtf8(profile.getDisplayName()));*/
 }
 
@@ -536 +536 @@
         QtContactList * qtContactList = _qtQuteCom->getQtContactList();
         CContactList & cContactList = qtContactList->getCContactList();
-        ContactProfile contactProfile = cContactList.getContactProfile(_contactId.toStdString());
+        ContactProfile contactProfile = cContactList.getContactProfile(std::string(_contactId.toUtf8()));
 
         if (!contactProfile.getFirstQuteComId().empty() && contactProfile.isAvailable()) {
@@ -642 +642 @@
                         QtContactList * qtContactList = _qtQuteCom->getQtContactList();
                         CContactList & cContactList = qtContactList->getCContactList();
-                        QString contactId = QString::fromStdString(cContactList.findContactThatOwns(contactName.toStdString()));
+                        QString contactId = QString::fromUtf8(cContactList.findContactThatOwns(std::string(contactName.toUtf8())).c_str());
                         
                         _ui.chatHistory->insertMessage(

qutecom/src/presentation/qt/chat/QtChatWindow.cpp

@@ -80 +80 @@
         QAction * tmp = actionParent->findChild<QAction *>(name);
         if (!tmp) {
-                LOG_ERROR("Couldn't find action named '" + name.toStdString() + "', cannot copy it");
+                LOG_ERROR("Couldn't find action named '" + name.toUtf8() + "', cannot copy it");
                 return;
         }
@@ -169 +169 @@
 #ifdef OS_LINUX
         const std::string & applicationIconPath = ConfigManager::getInstance().getCurrentConfig().getApplicationIconPath();
-        setWindowIcon(QIcon(QString::fromStdString(applicationIconPath)));
+        setWindowIcon(QIcon(QString::fromUtf8(applicationIconPath.c_str())));
 #endif
 
@@ -216 +216 @@
 
 ContactProfile QtChatWindow::getContactProfileFromContactId(const QString & contactId) {
-        return _qtQuteCom.getQtContactList()->getCContactList().getContactProfile(contactId.toStdString());
+        return _qtQuteCom.getQtContactList()->getCContactList().getContactProfile(std::string(contactId.toUtf8()));
 }
 
@@ -306 +306 @@
 void QtChatWindow::imAccountRemovedEventHandler(IMAccountManager & sender, std::string imAccountId)
 {
-        imAccountRemovedEventSignal(QString::fromStdString(imAccountId));
+        imAccountRemovedEventSignal(QString::fromUtf8(imAccountId.c_str()));
 }
 
@@ -330 +330 @@
         QtContactList * qtContactList = _qtQuteCom.getQtContactList();
         CContactList & cContactList = qtContactList->getCContactList();
-        std::string tmpSendername = cContactList.getContactProfile(contactId.toStdString()).getShortDisplayName();
+        std::string tmpSendername = cContactList.getContactProfile(std::string(contactId.toUtf8())).getShortDisplayName().c_str();
         if (tmpSendername.empty()) {
-                tmpSendername = defaultName.toStdString();
+                tmpSendername = std::string(defaultName.toUtf8());
         }
 
@@ -340 +340 @@
 void QtChatWindow::statusChangedSlot(QString contactId) {
         QtContactList * qtContactList = _qtQuteCom.getQtContactList();
-        std::string sdname = qtContactList->getCContactList().getContactProfile(contactId.toStdString()).getDisplayName();
-        EnumPresenceState::PresenceState pstate = qtContactList->getCContactList().getContactProfile(contactId.toStdString()).getPresenceState();
-        QString displayName = QString::fromStdString(sdname);
+        std::string sdname (qtContactList->getCContactList().getContactProfile(std::string(contactId.toUtf8())).getDisplayName().c_str());
+        EnumPresenceState::PresenceState pstate = qtContactList->getCContactList().getContactProfile(std::string(contactId.toUtf8())).getPresenceState();
+        QString displayName = QString::fromUtf8(sdname.c_str());
 
         // search for the tab that contain sender
@@ -470 +470 @@
                 if (qtContactList)
                 {
-                    contactProfile = qtContactList->getCContactList().getContactProfile(contactId.toStdString());
+                    contactProfile = qtContactList->getCContactList().getContactProfile(std::string(contactId.toUtf8()));
 
                     _ui->actionCallContact->setEnabled(contactProfile.hasCall()
@@ -527 +527 @@
                         const IMContact & from = imChatMessage->getIMContact();
                         std::string message = imChatMessage->getMessage();
-                        QString senderName = QString::fromStdString(from.getContactId());
+                        QString senderName = QString::fromUtf8(from.getContactId().c_str());
 
                         QtContactList * qtContactList = _qtQuteCom.getQtContactList();
                         CContactList & cContactList = qtContactList->getCContactList();
-                        QString contactId = QString::fromStdString(cContactList.findContactThatOwns(from));
+                        QString contactId = QString::fromUtf8(cContactList.findContactThatOwns(from).c_str());
                         QString senderDisplayName;
                         if(from.getAlias().size())
                                 senderDisplayName = QString::fromUtf8(from.getAlias().c_str());
                         else
-                                senderDisplayName = getShortDisplayName(contactId, QString::fromStdString(from.getDisplayContactId()));
+                                senderDisplayName = getShortDisplayName(contactId, QString::fromUtf8(from.getDisplayContactId().c_str()));
                         QString msg = QString::fromUtf8(message.c_str());
 
@@ -597 +597 @@
                 CContactList & cContactList = qtContactList->getCContactList();
 
-                QString contactId = QString::fromStdString(cContactList.findContactThatOwns(from));
+                QString contactId = QString::fromUtf8(cContactList.findContactThatOwns(from).c_str());
                 std::string tmpNickName;
                 IMAccount * imAccount =
@@ -618 +618 @@
                         senderName = QString::fromUtf8(from.getAlias().c_str());
                 else
-                        senderName = getShortDisplayName(contactId, QString::fromStdString(from.getDisplayContactId()));
+                        senderName = getShortDisplayName(contactId, QString::fromUtf8(from.getDisplayContactId().c_str()));
 
                 _chatWidget = new QtChatWidget(_cChatHandler, &_qtQuteCom, imChatSession->getId(), 0 /*parent*/);
@@ -624 +624 @@
                 _chatWidget->setNickName(nickName);
                 _chatWidget->setIMChatSession(imChatSession);
-                _chatWidget->setContactId(QString::fromStdString(qtContactList->getCContactList().findContactThatOwns(from)));
+                _chatWidget->setContactId(QString::fromUtf8(qtContactList->getCContactList().findContactThatOwns(from).c_str()));
                 Q_FOREACH(QTextEdit* textEdit, _chatWidget->findChildren<QTextEdit*>()) {
                         SAFE_CONNECT(textEdit, SIGNAL(selectionChanged()),
@@ -640 +640 @@
                 }
 
-                _mapSession.insertMulti(QString::fromStdString(imChatSession->getIMChat().getIMAccountId()),_chatWidget);
+                _mapSession.insertMulti(QString::fromUtf8(imChatSession->getIMChat().getIMAccountId().c_str()),_chatWidget);
 
                 if (imChatSession->isUserCreated()) {
@@ -647 +647 @@
                 }
 
-                statusChangedSlot(QString::fromStdString(cContactList.findContactThatOwns(from)));
+                statusChangedSlot(QString::fromUtf8(cContactList.findContactThatOwns(from).c_str()));
                 
                 activeTabChanged(_tabWidget->currentIndex());
@@ -666 +666 @@
                                 if(imChatMessage->getIMContact().getProtocol() != EnumIMProtocol::IMProtocolUnknown) {
                                         if(from.getAlias().size())
-                                                displayName = QString::fromStdString(from.getAlias());
+                                                displayName = QString::fromUtf8(from.getAlias().c_str());
                                         else
-                                                displayName = getShortDisplayName(contactId, QString::fromStdString(from.getDisplayContactId()));
+                                                displayName = getShortDisplayName(contactId, QString::fromUtf8(from.getDisplayContactId().c_str()));
 
                                 } else {
                                         if(imChatMessage->getIMContact().getAlias().size())
-                                                displayName = QString::fromStdString(imChatMessage->getIMContact().getAlias());
+                                                displayName = QString::fromUtf8(imChatMessage->getIMContact().getAlias().c_str());
                                         else
-                                                displayName = QString::fromStdString(imChatMessage->getIMContact().cleanContactId());
+                                                displayName = QString::fromUtf8(imChatMessage->getIMContact().cleanContactId().c_str());
                                         Time messageTime = imChatMessage->getTime();
                                         time = QTime(messageTime.getHour(), messageTime.getMinute());
@@ -732 +732 @@
                                         message += ", ";
                                 }
-                                QString contactId = QString::fromStdString(cContactList.findContactThatOwns((*it)));
+                                QString contactId = QString::fromUtf8(cContactList.findContactThatOwns((*it)).c_str());
                                 if((*it).getAlias().size())
                                         message += QString::fromUtf8((*it).getAlias().c_str());
@@ -775 +775 @@
         if (!contactId.isEmpty()) {
                 ContactProfile contactProfile =  getContactProfileFromContactId(contactId);
-                phoneNumber = QString::fromStdString(contactProfile.getMobilePhone());
+                phoneNumber = QString::fromUtf8(contactProfile.getMobilePhone().c_str());
         }
         ////
@@ -799 +799 @@
         if (!filename.isEmpty()) {
                 QFileInfo fileInfo(filename);
-                config.set(Config::FILETRANSFER_LASTUPLOADEDFILE_FOLDER_KEY, fileInfo.dir().absolutePath().toStdString());
+                config.set(Config::FILETRANSFER_LASTUPLOADEDFILE_FOLDER_KEY, std::string(fileInfo.dir().absolutePath().toUtf8()));
         }
 

qutecom/src/presentation/qt/chat/chatroom/QtChatRoomInviteDlg.cpp

@@ -121 +121 @@
                 groupItem->setFlags(Qt::ItemIsEnabled);
                 QString groupName = QString::fromUtf8((*it).second.c_str());
-                QString groupId = QString::fromStdString((*it).first);
+                QString groupId = QString::fromUtf8((*it).first.c_str());
                 groupItem->setText(0,groupName);
                 fillGroup(groupItem, groupId);
@@ -136 +136 @@
         for (it=contactsIdList.begin();it!=contactsIdList.end();it++) {
                 //(*it) is a contactId
-                ContactProfile contactProfile = _cContactList.getContactProfile((*it).toStdString());
+                ContactProfile contactProfile = _cContactList.getContactProfile(std::string((*it).toUtf8()));
                 if (contactProfile.getFirstAvailableIMContact(_chatSession) != NULL) {
                         QtChatRoomTreeWidgetItem * item = new QtChatRoomTreeWidgetItem (contactProfile,group );
-                        item->setText(0, QString::fromStdString (contactProfile.getDisplayName()));
+                        item->setText(0, QString::fromUtf8 (contactProfile.getDisplayName().c_str()));
                         switch ( contactProfile.getPresenceState()) {
                                 case EnumPresenceState::PresenceStateOnline:
@@ -177 +177 @@
         for (it=contactIdList.begin();it!=contactIdList.end();it++) {
                 ContactProfile contactProfile = _cContactList.getContactProfile((*it));
-                if (contactProfile.getGroupId() == groupId.toStdString()) {
-                        tmp << QString::fromStdString((*it));
+                if (contactProfile.getGroupId() == std::string(groupId.toUtf8())) {
+                        tmp << QString::fromUtf8((*it).c_str());
                 }
         }

qutecom/src/presentation/qt/chat/emoticons/QtEmoticonsManager.cpp

@@ -30 +30 @@
 QtEmoticonsManager::QtEmoticonsManager() {
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        loadFromFile(QString::fromStdString(config.getResourcesDir() + "pics/emoticons/icondef.xml"));
+        loadFromFile(QString::fromUtf8(std::string(config.getResourcesDir() + "pics/emoticons/icondef.xml").c_str()));
 }
 
@@ -145 +145 @@
                         }
                         if (e1.tagName() == "object") {
-                                QString resources_path = QString::fromStdString(config.getResourcesDir());
+                                QString resources_path = QString::fromUtf8(config.getResourcesDir().c_str());
                         #if defined (OS_WINDOWS)
                                 resources_path = resources_path.replace("\\","/");

qutecom/src/presentation/qt/conference/QtConferenceCallWidget.cpp

@@ -74 +74 @@
 
 void QtConferenceCallWidget::setFirstPeer(std::string peer) {
-        _ui->phoneNumber1LineEdit->setText(QString::fromStdString(peer));
+        _ui->phoneNumber1LineEdit->setText(QString::fromUtf8(peer.c_str()));
         _ui->phoneNumber1LineEdit->setReadOnly(true);
 }
@@ -86 +86 @@
                 {
                         ConferenceCall * confCall = new ConferenceCall(*_phoneLine);
-                        confCall->addPhoneNumber(_ui->phoneNumber1LineEdit->text().toStdString());
-                        confCall->addPhoneNumber(_ui->phoneNumber2LineEdit->text().toStdString());
+                        confCall->addPhoneNumber(std::string(_ui->phoneNumber1LineEdit->text().toUtf8()));
+                        confCall->addPhoneNumber(std::string(_ui->phoneNumber2LineEdit->text().toUtf8()));
                 }
                 accept();

qutecom/src/presentation/qt/config/QtAdvancedConfig.cpp

@@ -65 +65 @@
 
                 std::string key = keys[i];
-                QTableWidgetItem * itemKey = new QTableWidgetItem(QString::fromStdString(key));
+                QTableWidgetItem * itemKey = new QTableWidgetItem(QString::fromUtf8(key.c_str()));
                 _ui->tableWidget->setItem(i, KEY_NAME_COLUMN, itemKey);
 
@@ -95 +95 @@
                 itemType = new QTableWidgetItem(TYPE_INTEGER);
                 int tmp = boost::any_cast<int>(value);
-                itemValue = new QTableWidgetItem(QString::fromStdString(String::fromNumber(tmp)));
+                itemValue = new QTableWidgetItem(QString::fromUtf8(String::fromNumber(tmp).c_str()));
         } else if (Settings::isString(value)) {
                 itemType = new QTableWidgetItem(TYPE_STRING);
                 std::string tmp = boost::any_cast<std::string>(value);
-                itemValue = new QTableWidgetItem(QString::fromStdString(tmp));
+                itemValue = new QTableWidgetItem(QString::fromUtf8(tmp.c_str()));
         } else if (Settings::isStringList(value)) {
                 itemType = new QTableWidgetItem(TYPE_STRINGLIST);
                 StringList tmp = boost::any_cast<StringList>(value);
-                //itemValue = new QTableWidgetItem(QString::fromStdString(tmp));
+                //itemValue = new QTableWidgetItem(QString::fromUtf8(tmp));
         } else {
                 LOG_FATAL("unknown type");
@@ -122 +122 @@
                         continue;
                 }
-                std::string key = itemKey->text().toStdString();
+                std::string key(itemKey->text().toUtf8());
 
                 QTableWidgetItem * itemValue = _ui->tableWidget->item(row, VALUE_COLUMN);
@@ -135 +135 @@
 
                 if (itemType->text() == TYPE_BOOLEAN) {
-                        String tmp = itemValue->text().toStdString();
+                        String tmp(itemValue->text().toUtf8());
                         config.set(key, tmp.toBoolean());
                 } else if (itemType->text() == TYPE_INTEGER) {
-                        String tmp = itemValue->text().toStdString();
+                        String tmp(itemValue->text().toUtf8());
                         config.set(key, tmp.toInteger());
                 } else if (itemType->text() == TYPE_STRING) {
-                        std::string tmp = itemValue->text().toStdString();
+                        std::string tmp(itemValue->text().toUtf8());
                         config.set(key, tmp);
                 } else if (itemType->text() == TYPE_STRINGLIST) {
-                        //std::string tmp = itemValue->text().toStdString();
+                        //std::string tmp = itemValue->text().toUtf8();
                         //config.set(key, tmp);
                 } else {

qutecom/src/presentation/qt/config/QtAppearanceSettings.cpp

@@ -138 +138 @@
                 int row = _ui->themeListWidget->row(item);
                 QString theme = _themeList[row];
-                config.set(Config::APPEARANCE_CHATTHEME_KEY, theme.toStdString());
-                config.set(Config::APPEARANCE_CHATTHEMEVARIANT_KEY, _ui->comboBox->currentText ().toStdString());
+                config.set(Config::APPEARANCE_CHATTHEME_KEY, std::string(theme.toUtf8()));
+                config.set(Config::APPEARANCE_CHATTHEMEVARIANT_KEY, std::string(_ui->comboBox->currentText ().toUtf8()));
         } else {
                 LOG_WARN("No current chat theme");
@@ -173 +173 @@
                 if (themeDir == currentTheme) {
                         _ui->comboBox->addItems(QtChatTheme::getThemeListVariant(themeDir));
-                        _ui->comboBox->setCurrentIndex(_ui->comboBox->findText (QString::fromStdString(config.getChatThemeVariant())));
+                        _ui->comboBox->setCurrentIndex(_ui->comboBox->findText (QString::fromUtf8(config.getChatThemeVariant().c_str())));
                         
                         _ui->themeListWidget->setCurrentItem(item);

qutecom/src/presentation/qt/config/QtAudioSettings.cpp

@@ -42 +42 @@
 
 static AudioDevice getAudioDeviceFromComboBox(QComboBox* comboBox, const std::list<AudioDevice> deviceList) {
-        std::string concatString = comboBox->itemData(comboBox->currentIndex()).toString().toStdString();
+        std::string concatString(comboBox->itemData(comboBox->currentIndex()).toString().toUtf8());
         for (std::list<AudioDevice>::const_iterator it = deviceList.begin();
                 it != deviceList.end();
@@ -104 +104 @@
         int nbCodec = _ui->audioCodecListWidget->count();
         for (int i = 0; i < nbCodec; ++i) {
-                std::string audioCodec = _ui->audioCodecListWidget->item(i)->text().toStdString();
+                std::string audioCodec(_ui->audioCodecListWidget->item(i)->text().toUtf8());
                 // HACK: PHAPI_SPEEXWB_REPLACES_G726WB_HACK
                 #ifdef PH_SPEEXWB_REPLACES_G726WB  
@@ -140 +140 @@
                         (*it).getName().c_str(),
 #endif
-                        QString::fromStdString((*it).getData().toString())
+                        QString::fromUtf8((*it).getData().toString().c_str())
                 );
 #ifdef OS_LINUX
@@ -154 +154 @@
                         //QString::fromUtf8(tmpDev.getName().c_str()),
                         QString(tmpDev.getName().c_str()),
-                        QString::fromStdString(tmpDev.getData().toString())
+                        QString::fromUtf8(tmpDev.getData().toString().c_str())
                 );
         }
@@ -186 +186 @@
                         (*it).getName().c_str(),
 #endif
-                        QString::fromStdString((*it).getData().toString())
+                        QString::fromUtf8((*it).getData().toString().c_str())
                 );
 #ifdef OS_LINUX
@@ -200 +200 @@
                         //QString::fromUtf8(tmpDev.getName().c_str()),
                         QString(tmpDev.getName().c_str()),
-                        QString::fromStdString(tmpDev.getData().toString())
+                        QString::fromUtf8(tmpDev.getData().toString().c_str())
                 );
         }
@@ -230 +230 @@
                         (*it).getName().c_str(),
 #endif
-                        QString::fromStdString((*it).getData().toString())
+                        QString::fromUtf8((*it).getData().toString().c_str())
                 );
 #ifdef OS_LINUX
@@ -244 +244 @@
                         //QString::fromUtf8(tmpDev.getName().c_str()),
                         QString(tmpDev.getName().c_str()),
-                        QString::fromStdString(tmpDev.getData().toString())
+                        QString::fromUtf8(tmpDev.getData().toString().c_str())
                 );
         }

qutecom/src/presentation/qt/config/QtCallForwardSettings.cpp

@@ -78 +78 @@
         Config & config = ConfigManager::getInstance().getCurrentConfig();
 
-        std::string number1 = _ui->phoneNumber1Edit->text().toStdString();
-        std::string number2 = _ui->phoneNumber2Edit->text().toStdString();
-        std::string number3 = _ui->phoneNumber3Edit->text().toStdString();
+        std::string number1(_ui->phoneNumber1Edit->text().toUtf8());
+        std::string number2(_ui->phoneNumber2Edit->text().toUtf8());
+        std::string number3(_ui->phoneNumber3Edit->text().toUtf8());
         bool mustCallTheWs = false;
 
@@ -133 +133 @@
 
         _ui->forwardToVoiceMailRadioButton->setEnabled(config.getVoiceMailActive());
-        QString tmp = QString::fromStdString(config.getCallForwardPhoneNumber1());
+        QString tmp = QString::fromUtf8(config.getCallForwardPhoneNumber1().c_str());
         if (!tmp.isEmpty()) {
                 _ui->phoneNumber1Edit->setText(tmp);
         }
-        tmp = QString::fromStdString(config.getCallForwardPhoneNumber2());
+        tmp = QString::fromUtf8(config.getCallForwardPhoneNumber2().c_str());
         if (!tmp.isEmpty()) {
                 _ui->phoneNumber2Edit->setText(tmp);
         }
-        tmp = QString::fromStdString(config.getCallForwardPhoneNumber3());
+        tmp = QString::fromUtf8(config.getCallForwardPhoneNumber3().c_str());
         if (!tmp.isEmpty()) {
                 _ui->phoneNumber3Edit->setText(tmp);

qutecom/src/presentation/qt/config/QtLanguagesSettings.cpp

@@ -94 +94 @@
         config.set(Config::LANGUAGE_KEY, LanguageList::getISO639Code(language));
         
-        config.set(Config::TRANSLATION_SENT_KEY, _ui->comboBox_sent->currentText().toStdString());
-        config.set(Config::TRANSLATION_RECEIVED_KEY, _ui->comboBox_received->currentText().toStdString());
+        config.set(Config::TRANSLATION_SENT_KEY, std::string(_ui->comboBox_sent->currentText().toUtf8()));
+        config.set(Config::TRANSLATION_RECEIVED_KEY, std::string(_ui->comboBox_received->currentText().toUtf8()));
 }
 
@@ -107 +107 @@
         }
         
-        _ui->comboBox_sent->setCurrentIndex(_ui->comboBox_sent->findText(QString::fromStdString(config.getTranslationSent())));
-        _ui->comboBox_received->setCurrentIndex(_ui->comboBox_received->findText(QString::fromStdString(config.getTranslationReceived())));
+        _ui->comboBox_sent->setCurrentIndex(_ui->comboBox_sent->findText(QString::fromUtf8(config.getTranslationSent().c_str())));
+        _ui->comboBox_received->setCurrentIndex(_ui->comboBox_received->findText(QString::fromUtf8(config.getTranslationReceived().c_str())));
 }
 

qutecom/src/presentation/qt/config/QtNotificationSettings.cpp

@@ -43 +43 @@
         : QWidget()
         , _configKey(configKey)
-        , _soundFile(QString::fromStdString(soundFile))
+        , _soundFile(QString::fromUtf8(soundFile.c_str()))
         , _caption(caption) {
         _ui = new Ui::NotificationSettingsItem;
@@ -77 +77 @@
         QString file = QFileDialog::getOpenFileName(this,
                                 tr("Choose a sound file"),
-                                QString::fromStdString(config.getResourcesDir()) + "sounds",
+                                QString::fromUtf8(config.getResourcesDir().c_str()) + "sounds",
                                 tr("Sounds") + " (*.wav)");
 
-        std::string tmp = file.toStdString();
+        std::string tmp(file.toUtf8());
         tmp = File::convertPathSeparators(tmp);
-        file = QString::fromStdString(tmp);
+        file = QString::fromUtf8(tmp.c_str());
 
         if (!file.isEmpty()) {
@@ -90 +90 @@
 
 void QtNotificationSettingsItem::playSound() {
-        std::string soundFile = _ui->soundLineEdit->text().toStdString();
+        std::string soundFile(_ui->soundLineEdit->text().toUtf8());
         Sound::play(soundFile, AudioDeviceManager::getInstance().getDefaultOutputDevice());
 }
@@ -99 +99 @@
         std::string name;
         if (_ui->checkBox->isChecked()) {
-                name = _ui->soundLineEdit->text().toStdString();
+                name = std::string(_ui->soundLineEdit->text().toUtf8());
         }
         config.setResource(_configKey, name);

qutecom/src/presentation/qt/config/QtQuteComConfigDialog.cpp

@@ -130 +130 @@
                 }
         }
-        LOG_WARN("unknown page name=" + pageName.toStdString());
+        LOG_WARN("unknown page name=" + pageName.toUtf8());
 }
 

qutecom/src/presentation/qt/config/QtVideoSettings.cpp

@@ -119 +119 @@
                 }
                 else {
-                        LOG_FATAL("unknown video quality=" + text.toStdString());
+                        LOG_FATAL("unknown video quality=" + text.toUtf8());
                 }
                 config.set(Config::VIDEO_QUALITY_KEY, EnumVideoQuality::toString(videoQuality));
@@ -200 +200 @@
         if (!_previewStarted) {
                 _webcamDriver->frameCapturedEvent += boost::bind(&QtVideoSettings::frameCapturedEventHandler, this, _1, _2);
-                _webcamDriver->setDevice(deviceName.toStdString());
+                _webcamDriver->setDevice(std::string(deviceName.toUtf8()));
                 _webcamDriver->setResolution(320, 240);
                 _webcamDriver->setPalette(PIX_OSI_YUV420P);

qutecom/src/presentation/qt/config/QtVoicemailSettings.cpp

@@ -68 +68 @@
                 SipAccount * sipaccount = userprofile->getSipAccount();
                 if (sipaccount) {
-                        sipaccount->setVoicemailNumber(_ui->voicemailNumber->text().toStdString());
+                        sipaccount->setVoicemailNumber(std::string(_ui->voicemailNumber->text().toUtf8()));
                 }
         }
@@ -86 +86 @@
         }
 
-        _ui->voicemailNumber->setText(QString::fromStdString(number));
+        _ui->voicemailNumber->setText(QString::fromUtf8(number.c_str()));
 }

qutecom/src/presentation/qt/contactlist/ContactGroupPopupMenu.cpp

@@ -55 +55 @@
                 tr("&No"),
                 QString(), 0, 1) == 0) {
-                        _cContactList.removeContactGroup(_groupId.toStdString());
+                _cContactList.removeContactGroup(std::string(_groupId.toUtf8()));
                 }
 }
 
 void ContactGroupPopupMenu::renameContactGroup() const {
-        std::string tmp = _cContactList.getContactGroupName(_groupId.toStdString());
+        std::string tmp = _cContactList.getContactGroupName(std::string(_groupId.toUtf8()));
         QString groupName = QString::fromUtf8(tmp.c_str());
         QtRenameGroup dialog(groupName, qobject_cast<QWidget *>(parent()));
         if (dialog.exec()) {
-                _cContactList.renameContactGroup(_groupId.toStdString(), dialog.getGroupName().toUtf8().data());
+                _cContactList.renameContactGroup(std::string(_groupId.toUtf8()), std::string(dialog.getGroupName().toUtf8().data()));
         }
 }

qutecom/src/presentation/qt/contactlist/QtContact.cpp

@@ -98 +98 @@
 
 QString QtContact::getId() const {
-        return QString::fromStdString(_contactId);
+        return QString::fromUtf8(_contactId.c_str());
 }
 
@@ -232 +232 @@
 
 QString QtContact::getMobilePhone() const {
-        return QString::fromStdString(_contactProfile.getMobilePhone());
+        return QString::fromUtf8(_contactProfile.getMobilePhone().c_str());
 }
 
 QString QtContact::getHomePhone() const {
-        return QString::fromStdString(_contactProfile.getHomePhone());
+        return QString::fromUtf8(_contactProfile.getHomePhone().c_str());
 }
 
 QString QtContact::getWebsite() const {
-        return QString::fromStdString(_contactProfile.getWebsite());
+        return QString::fromUtf8(_contactProfile.getWebsite().c_str());
 }
 
 QString QtContact::getWorkPhone() const {
-        return QString::fromStdString(_contactProfile.getWorkPhone());
+        return QString::fromUtf8(_contactProfile.getWorkPhone().c_str());
 }
 
 QString QtContact::getQuteComNumber() const {
-        return QString::fromStdString(_contactProfile.getFirstAvailableQuteComId());
+        return QString::fromUtf8(_contactProfile.getFirstAvailableQuteComId().c_str());
 }
 
 QString QtContact::getPreferredNumber() const {
-        return QString::fromStdString(_contactProfile.getPreferredNumber());
+        return QString::fromUtf8(_contactProfile.getPreferredNumber().c_str());
 }
 
 QString QtContact::getFirstFreePhoneNumber() const {
-        return QString::fromStdString(_contactProfile.getFirstFreePhoneNumber());
+        return QString::fromUtf8(_contactProfile.getFirstFreePhoneNumber().c_str());
 }
 
@@ -299 +299 @@
 
 void QtContact::startCall(const QString & number) {
-        _cQuteCom.getCUserProfileHandler().getCUserProfile()->makeCall(number.toStdString());
+        _cQuteCom.getCUserProfileHandler().getCUserProfile()->makeCall(std::string(number.toUtf8()));
 }
 
@@ -345 +345 @@
 
 QString QtContact::getDisplayName() const {
-        return QString::fromStdString(_contactProfile.getDisplayName());
+        return QString::fromUtf8(_contactProfile.getDisplayName().c_str());
 }
 

qutecom/src/presentation/qt/contactlist/QtContactList.cpp

@@ -163 +163 @@
 
 void QtContactList::contactGroupAddedEvent(const std::string & groupId) {
-        QString tmp = QString::fromStdString(groupId);
+        QString tmp = QString::fromUtf8(groupId.c_str());
         if (_contactManager->groupsAreHidden()) {
                 tmp = DEFAULT_GROUP_NAME;
@@ -171 +171 @@
 
 void QtContactList::contactGroupRemovedEvent(const std::string & groupId) {
-        QList <QTreeWidgetItem *> list = _ui->treeWidget->findItems(QString::fromStdString(groupId), Qt::MatchExactly);
+        QList <QTreeWidgetItem *> list = _ui->treeWidget->findItems(QString::fromUtf8(groupId.c_str()), Qt::MatchExactly);
         if (!list.isEmpty()) {
                 _ui->treeWidget->takeTopLevelItem(_ui->treeWidget->indexOfTopLevelItem(list[0]));
@@ -186 +186 @@
 
 void QtContactList::contactRemovedEvent(const std::string & contactId) {
-        _contactManager->removeContact(QString::fromStdString(contactId));
+        _contactManager->removeContact(QString::fromUtf8(contactId.c_str()));
         updatePresentation();
         _waitingForModel = false;
@@ -199 +199 @@
 void QtContactList::contactChangedEvent(const std::string & contactId) {
         _contactManager->updateContact(contactId);
-        contactChangedEventSignal(QString::fromStdString(contactId));
+        contactChangedEventSignal(QString::fromUtf8(contactId.c_str()));
 }
 
@@ -212 +212 @@
                 for (std::list<Contact>::iterator it = contacts.begin();it != contacts.end() ; it++ )
                 {
-                        if ( (*it).getGroupId() ==  contactGroupId.toStdString()) 
+                        if ( (*it).getGroupId() ==  std::string(contactGroupId.toUtf8())) 
                         {
                                 group_has_contact = true;
@@ -223 +223 @@
                         QTreeWidgetItem * group = new QTreeWidgetItem(_ui->treeWidget);
                         group->setText(0, contactGroupId);
-                        group->setText(1, QString::fromStdString(_cQuteCom.getCUserProfileHandler().getCUserProfile()->getCContactList().getContactGroupName(contactGroupId.toStdString())));
+                        group->setText(1, QString::fromUtf8(_cQuteCom.getCUserProfileHandler().getCUserProfile()->getCContactList().getContactGroupName(std::string(contactGroupId.toUtf8())).c_str()));
                         _ui->treeWidget->setItemExpanded(group, true);
                 }
@@ -241 +241 @@
                 _waitingForModel = true;
 
-                ContactProfile dstContactProfile = _cContactList.getContactProfile(dstContact.toStdString());
-                ContactProfile srcContactProfile = _cContactList.getContactProfile(srcContact.toStdString());
+                ContactProfile dstContactProfile = _cContactList.getContactProfile(std::string(dstContact.toUtf8()));
+                ContactProfile srcContactProfile = _cContactList.getContactProfile(std::string(srcContact.toUtf8()));
                 if (QMessageBox::question(_contactListWidget,
                         tr("@product@ - Merge Contacts"),
                         tr("Merge %1 with %2?")
-                        .arg(QString::fromStdString(dstContactProfile.getDisplayName()))
-                        .arg(QString::fromStdString(srcContactProfile.getDisplayName())),
+                        .arg(QString::fromUtf8(dstContactProfile.getDisplayName().c_str()))
+                        .arg(QString::fromUtf8(srcContactProfile.getDisplayName().c_str())),
                         tr("&Yes"), tr("&No"),
                         QString(), 0, 1) == 0) {
-                        _cContactList.merge(dstContact.toStdString(), srcContact.toStdString());
+                        _cContactList.merge(std::string(dstContact.toUtf8()), std::string(srcContact.toUtf8()));
                 } else {
                         _waitingForModel = false;

qutecom/src/presentation/qt/contactlist/QtContactManager.cpp

@@ -127 +127 @@
 
 void QtContactManager::editContact(QString contactId) {
-        ContactProfile contactProfile = _cUserProfile.getCContactList().getContactProfile(contactId.toStdString());
+        ContactProfile contactProfile = _cUserProfile.getCContactList().getContactProfile(std::string(contactId.toUtf8()));
         QtProfileDetails qtProfileDetails(_cUserProfile, contactProfile, _tree, tr("Edit Contact"));
         if (qtProfileDetails.show()) {
@@ -148 +148 @@
                 0, 1) == 0) {
 
-                _cUserProfile.getCContactList().removeContact(item->text(0).toStdString());
+                _cUserProfile.getCContactList().removeContact(std::string(item->text(0).toUtf8()));
         }
 }
@@ -285 +285 @@
         QtContactListManager * ul = QtContactListManager::getInstance();
         QString userId = item->text(0);
-        ContactProfile contactProfile = _qtContactList.getCContactList().getContactProfile(userId.toStdString());
+        ContactProfile contactProfile = _qtContactList.getCContactList().getContactProfile(std::string(userId.toUtf8()));
 
         if (config.getGeneralClickStartChat() ) 
@@ -430 +430 @@
                 if (canShowUser(&cprofile)) {
                         //Create new group if needed
-                        QTreeWidgetItem * group = createGroupItem(QString::fromStdString(cprofile.getGroupId()));
+                        QTreeWidgetItem * group = createGroupItem(QString::fromUtf8(cprofile.getGroupId().c_str()));
 
                         //We have the group, now add users to the group
@@ -437 +437 @@
                         QString contactName;
                         newContact = new QTreeWidgetItem(group);
-                        newContact->setText(0, QString::fromStdString((*it)));
+                        newContact->setText(0, QString::fromUtf8((*it).c_str()));
                         newContact->setFlags(newContact->flags() | Qt::ItemIsEditable);
                         qtContact = new QtContact((*it), _cQuteCom, _tree);
@@ -457 +457 @@
                         if ((*it)->getState() != EnumPhoneCallState::PhoneCallStateClosed) {
                                 QtConferenceAction * action = new
-                                        QtConferenceAction(QString::fromStdString((*it)->getPeerSipAddress().getUserName()), menu);
+                                        QtConferenceAction(QString::fromUtf8((*it)->getPeerSipAddress().getUserName().c_str()), menu);
                                 action->setPhoneCall((*it));
                                 SAFE_CONNECT(action, SIGNAL(triggered(bool)), SLOT(inviteToConference()));
@@ -630 +630 @@
                         website = "http://" + website;
                 }
-                WebBrowser::openUrl(website.toStdString());
+                WebBrowser::openUrl(std::string(website.toUtf8()));
         }
 }
@@ -650 +650 @@
                         item->setText(0, contactGroupId);
                 }
-                item->setText(1, QString::fromStdString(_cQuteCom.getCUserProfileHandler().getCUserProfile()->getCContactList().getContactGroupName(contactGroupId.toStdString())));
+                item->setText(1, QString::fromUtf8(_cQuteCom.getCUserProfileHandler().getCUserProfile()->getCContactList().getContactGroupName(std::string(contactGroupId.toUtf8())).c_str()));
                 _tree->setItemExpanded(item, true);
         } else {
@@ -661 +661 @@
 void QtContactManager::addContact(const QString & contactId) {
         QtContactListManager * ul = QtContactListManager::getInstance();
-        QtContact * qtContact = new QtContact(contactId.toStdString(), _cQuteCom, _tree);
+        QtContact * qtContact = new QtContact(std::string(contactId.toUtf8()), _cQuteCom, _tree);
         ul->addContact(qtContact);
 
-        ContactProfile contactProfile = _qtContactList.getCContactList().getContactProfile(contactId.toStdString());
-        QTreeWidgetItem * groupItem = createGroupItem(QString::fromStdString(contactProfile.getGroupId()));
+        ContactProfile contactProfile = _qtContactList.getCContactList().getContactProfile(std::string(contactId.toUtf8()));
+        QTreeWidgetItem * groupItem = createGroupItem(QString::fromUtf8(contactProfile.getGroupId().c_str()));
 
         int contactCount = groupItem->childCount();
@@ -745 +745 @@
         //Looking for the contact in the destination group
         //If it is inside this group nothing is done
-        QTreeWidgetItem * group = findGroupItem(QString::fromStdString(dstGroupId));
+        QTreeWidgetItem * group = findGroupItem(QString::fromUtf8(dstGroupId.c_str()));
         if (!group) {
                 return;
         }
-        if (findContactInGroup(group, QString::fromStdString(contactId))) {
-                return;
-        }
-
-        removeContact(QString::fromStdString(contactId));
-        addContact(QString::fromStdString(contactId));
+        if (findContactInGroup(group, QString::fromUtf8(contactId.c_str()))) {
+                return;
+        }
+
+        removeContact(QString::fromUtf8(contactId.c_str()));
+        addContact(QString::fromUtf8(contactId.c_str()));
 }
 
@@ -847 +847 @@
         QtContactListManager * ul = QtContactListManager::getInstance();
 
-        QTreeWidgetItem* item = findContactItem(QString::fromStdString(contactId));
+        QTreeWidgetItem* item = findContactItem(QString::fromUtf8(contactId.c_str()));
         bool oldVisible = item != 0;
 
@@ -855 +855 @@
         if (oldVisible && !newVisible) {
                 // Remove
-                removeContact(QString::fromStdString(contactId));
+                removeContact(QString::fromUtf8(contactId.c_str()));
         } else if (!oldVisible && newVisible) {
                 // Add
-                addContact(QString::fromStdString(contactId));
+                addContact(QString::fromUtf8(contactId.c_str()));
         } else if (oldVisible && newVisible) {
                 // Update
-                ul->contactUpdated(QString::fromStdString(contactId));
+                ul->contactUpdated(QString::fromUtf8(contactId.c_str()));
 
                 // Repaint only the item. We adjust the rect to avoid repainting

qutecom/src/presentation/qt/contactlist/QtContactMenu.cpp

@@ -45 +45 @@
 
                         if (!tmpContactProfile.getMobilePhone().empty()) {
-                                QString mobilePhone = QString::fromStdString(tmpContactProfile.getMobilePhone());
+                                QString mobilePhone = QString::fromUtf8(tmpContactProfile.getMobilePhone().c_str());
                                 //Call mobile action
                                 QAction * tmpAction;
@@ -78 +78 @@
 
                                 QString freePhoneNumber = 
-                                        QString::fromStdString(tmpContactProfile.getFirstAvailableQuteComIMContact().getDisplayContactId());
+                                        QString::fromUtf8(tmpContactProfile.getFirstAvailableQuteComIMContact().getDisplayContactId().c_str());
                                 QAction * tmpAction;
                                 tmpAction = menu->addAction(displayName);
@@ -103 +103 @@
                         if (tmpContactProfile.hasAvailableSIPNumber() ) {
 
-                                QString freePhoneNumber = QString::fromStdString(tmpContactProfile.getFirstFreePhoneNumber());
+                                QString freePhoneNumber = QString::fromUtf8(tmpContactProfile.getFirstFreePhoneNumber().c_str());
                                 QAction * tmpAction;
                                 tmpAction = menu->addAction(displayName);
@@ -134 +134 @@
 
                         if (!tmpContactProfile.getHomePhone().empty()) {
-                                QString homePhone = QString::fromStdString(tmpContactProfile.getHomePhone());
+                                QString homePhone = QString::fromUtf8(tmpContactProfile.getHomePhone().c_str());
                                 QAction * tmpAction;
                                 if (displayName == " ") {
@@ -164 +164 @@
 
                                 QAction * tmpAction = menu->addAction(displayName);
-                                tmpAction->setData(QVariant(QString::fromStdString(*it)));
+                                tmpAction->setData(QVariant(QString::fromUtf8((*it).c_str())));
                                 EnumPresenceState::PresenceState presenceState = tmpContactProfile.getPresenceState();
                                 setPresenceIcon(tmpAction, presenceState);
@@ -225 +225 @@
 
                                 QAction * tmpAction = menu->addAction(displayName);
-                                tmpAction->setData(QVariant(QString::fromStdString(*it)));
+                                tmpAction->setData(QVariant(QString::fromUtf8((*it).c_str())));
                                 EnumPresenceState::PresenceState presenceState = tmpContactProfile.getPresenceState();
                                 setPresenceIcon(tmpAction, presenceState);

qutecom/src/presentation/qt/contactlist/QtContactTreeMouseFilter.cpp

@@ -175 +175 @@
         QString destinationContactId = _dropDestinationItem->text(0);
 
-        ContactProfile sourceProfile = _cContactList.getContactProfile(_dropSourceContactId.toStdString());
-        ContactProfile destinationProfile = _cContactList.getContactProfile(destinationContactId.toStdString());
+        ContactProfile sourceProfile = _cContactList.getContactProfile(std::string(_dropSourceContactId.toUtf8()));
+        ContactProfile destinationProfile = _cContactList.getContactProfile(std::string(destinationContactId.toUtf8()));
 
         if ( sourceProfile.getGroupId() == destinationProfile.getGroupId() || _tree->topLevelItemCount() == 1 ) {
@@ -193 +193 @@
                         groupId = destinationContactId;
                 }
-                sourceProfile.setGroupId(groupId.toStdString());
+                sourceProfile.setGroupId(std::string(groupId.toUtf8()));
                 _cContactList.updateContact(sourceProfile);
         }

qutecom/src/presentation/qt/contactlist/QtContactWidget.cpp

@@ -142 +142 @@
 void QtContactWidget::callButtonClicked() {
         QtContactListManager * ul = QtContactListManager::getInstance();
-        ul->startFreeCall(QString::fromStdString(_contactId));
+        ul->startFreeCall(QString::fromUtf8(_contactId.c_str()));
 }
 
 void QtContactWidget::smsButtonClicked() {
         QtContactListManager * ul = QtContactListManager::getInstance();
-        ul->startSMS(QString::fromStdString(_contactId));
+        ul->startSMS(QString::fromUtf8(_contactId.c_str()));
 }
 
 void QtContactWidget::chatButtonClicked() {
         QtContactListManager * ul = QtContactListManager::getInstance();
-        ul->startChat(QString::fromStdString(_contactId));
+        ul->startChat(QString::fromUtf8(_contactId.c_str()));
 }
 
 void QtContactWidget::sendFileButtonClicked() {
         QtContactListManager * ul = QtContactListManager::getInstance();
-        ul->sendFile(QString::fromStdString(_contactId));
+        ul->sendFile(QString::fromUtf8(_contactId.c_str()));
 }
 
@@ -164 +164 @@
         QtContactListManager * ul = QtContactListManager::getInstance();
 
-        if (!ul->getMobilePhone(QString::fromStdString(_contactId)).isEmpty()) {
+        if (!ul->getMobilePhone(QString::fromUtf8(_contactId.c_str())).isEmpty()) {
                 _ui->mobileButton->setToolTip(tr("Click here to call"));
         } else {
@@ -170 +170 @@
         }
 
-        if (!ul->getHomePhone(QString::fromStdString(_contactId)).isEmpty()) {
+        if (!ul->getHomePhone(QString::fromUtf8(_contactId.c_str())).isEmpty()) {
                 _ui->landlineButton->setToolTip(tr("Click here to call"));
         } else {
@@ -205 +205 @@
 void QtContactWidget::mobileButtonClicked() {
         QtContactListManager * ul = QtContactListManager::getInstance();
-        if (!ul->getMobilePhone(QString::fromStdString(_contactId)).isEmpty()) {
-                ul->startCall(QString::fromStdString(_contactId), _ui->mobileButton->text());
+        if (!ul->getMobilePhone(QString::fromUtf8(_contactId.c_str())).isEmpty()) {
+                ul->startCall(QString::fromUtf8(_contactId.c_str()), _ui->mobileButton->text());
         } else {
                 editContact(_text);
@@ -214 +214 @@
 void QtContactWidget::landlineButtonClicked() {
         QtContactListManager * ul = QtContactListManager::getInstance();
-        if (!ul->getHomePhone(QString::fromStdString(_contactId)).isEmpty()) {
-                ul->startCall(QString::fromStdString(_contactId), _ui->landlineButton->text());
+        if (!ul->getHomePhone(QString::fromUtf8(_contactId.c_str())).isEmpty()) {
+                ul->startCall(QString::fromUtf8(_contactId.c_str()), _ui->landlineButton->text());
         } else {
                 editContact(_text);
@@ -234 +234 @@
         QtContactListManager * ul = QtContactListManager::getInstance();
 
-        QtContact * qtContact = ul->getContact(QString::fromStdString(_contactId));
+        QtContact * qtContact = ul->getContact(QString::fromUtf8(_contactId.c_str()));
         if (!qtContact) {
                 return;

qutecom/src/presentation/qt/contactlist/QtTreeViewDelegate.cpp

@@ -53 +53 @@
         QtContact * qtContact = ul->getContact(index.data().toString());
         QtContactWidget * widget =
-                new QtContactWidget(qtContact->getId().toStdString(), _cQuteCom,
+        new QtContactWidget(std::string(qtContact->getId().toUtf8()), _cQuteCom,
                         _qtContactManager, parent);
         return widget;
@@ -132 +132 @@
         } else {
                 groupName = index.data().toString();
-                groupId = groupName.toStdString();
+                groupId = std::string(groupName.toUtf8());
                 groupNameTmp = _cQuteCom.getCUserProfileHandler().getCUserProfile()->getCContactList().getContactGroupName(groupId);
         }

qutecom/src/presentation/qt/filetransfer/QtFileTransfer.cpp

@@ -75 +75 @@
         QString downloadFolder;
         QString filename =  QString::fromUtf8(fileSession->getFileName().c_str());
-        QString contact = QString::fromStdString(fileSession->getIMContact().getDisplayContactId());
+        QString contact = QString::fromUtf8(fileSession->getIMContact().getDisplayContactId().c_str());
 
         LOG_DEBUG("incoming file: " + fileSession->getFileName() +
@@ -169 +169 @@
         }
 #if defined(OS_WINDOWS)
-        else if (fileinfo.suffix() == QString::fromStdString("lnk")) {
+        else if (fileinfo.suffix() == QString::fromUtf8("lnk")) {
                 QMessageBox::warning(_qtFileTransferWidget,
                         tr("%1 is a shortcut.").arg(fileinfo.fileName()),
@@ -196 +196 @@
                         std::string contactId = cContactList.findContactThatOwns(*it);
                         fileSession->addContact(contactId);
-                        _qtFileTransferWidget->addSendItem(fileSession, filename.toStdString(), (*it).getDisplayContactId());
+                        _qtFileTransferWidget->addSendItem(fileSession, std::string(filename.toUtf8()), (*it).getDisplayContactId());
                 }
 
@@ -209 +209 @@
 
 void QtFileTransfer::peerNeedsUpgradeEventHandler(FileSessionManager & sender, const std::string contactID) {
-        peerNeedsUpgradeEventHandlerSignal(QString::fromStdString(contactID));
+        peerNeedsUpgradeEventHandlerSignal(QString::fromUtf8(contactID.c_str()));
 }
 
@@ -237 +237 @@
 
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString startDir = QString::fromStdString(config.getLastUploadedFileFolder());
+        QString startDir = QString::fromUtf8(config.getLastUploadedFileFolder().c_str());
 
         QString filename = QFileDialog::getOpenFileName(

qutecom/src/presentation/qt/filetransfer/QtFileTransferDownloadItem.cpp

@@ -35 +35 @@
 
         setFilename(QString::fromUtf8(fileSession->getFileName().c_str()));
-        setContact(QString::fromStdString(_receiveFileSession->getIMContact().getDisplayContactId()));
+        setContact(QString::fromUtf8(_receiveFileSession->getIMContact().getDisplayContactId().c_str()));
 
         // bind to fileSession events

qutecom/src/presentation/qt/filetransfer/QtFileTransferItem.cpp

@@ -150 +150 @@
 
 void QtFileTransferItem::open() {
-        LOG_DEBUG("open from file transfer manager: " + _filename.toStdString());
+        LOG_DEBUG("open from file transfer manager: " + _filename.toUtf8());
 #ifdef OS_WINDOWS
         //TODO: other systems
-        WebBrowser::openUrl(_filename.toStdString());
+        WebBrowser::openUrl(_filename.toUtf8());
 #endif
 }
@@ -159 +159 @@
 void QtFileTransferItem::updateState(int e) {
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString companyWebSiteUrl = QString::fromStdString(config.getCompanyWebSiteUrl());
+        QString companyWebSiteUrl = QString::fromUtf8(config.getCompanyWebSiteUrl().c_str());
 
         IFileSession::IFileSessionEvent event = (IFileSession::IFileSessionEvent) e;

qutecom/src/presentation/qt/filetransfer/QtFileTransferUploadItem.cpp

@@ -36 +36 @@
         _filename = filename;
 
-        File f(filename.toStdString());
-        setFilename(QString::fromStdString(f.getFileName()));
-        setContact(QString::fromStdString(contact));
+                File f(std::string(filename.toUtf8()));
+        setFilename(QString::fromUtf8(f.getFileName().c_str()));
+        setContact(QString::fromUtf8(contact.c_str()));
 
         // bind to fileSession events

qutecom/src/presentation/qt/filetransfer/QtFileTransferWidget.cpp

@@ -51 +51 @@
 #ifdef OS_LINUX
         const std::string &applicationIconPath = config.getApplicationIconPath();
-        setWindowIcon(QIcon(QString::fromStdString(applicationIconPath)));
+        setWindowIcon(QIcon(QString::fromUtf8(applicationIconPath.c_str())));
 #endif
 
@@ -145 +145 @@
 
         QtFileTransferUploadItem * fileTransferItem = new QtFileTransferUploadItem(this, fileSession,
-                QString::fromStdString(filename), contact);
+                QString::fromUtf8(filename.c_str()), contact);
         SAFE_CONNECT(fileTransferItem, SIGNAL(removeClicked()), SLOT(itemRemoveClicked()));
         QListWidgetItem * item = new QListWidgetItem(/*_ui->uploadTransferListWidget*/);

qutecom/src/presentation/qt/history/QtHistory.cpp

@@ -48 +48 @@
 QString QtHistory::formatName(const std::string& name) const
 {
-        QString tmpUserName = QString::fromStdString(name)/*.remove("sip:")*/;
+        QString tmpUserName = QString::fromUtf8(name.c_str())/*.remove("sip:")*/;
 
         CQuteCom & cQuteCom = _cHistory.getCQuteCom();
@@ -59 +59 @@
                         ContactProfile contactProfile = cUserProfile->getCContactList().getContactProfile(uuid);
                         if(!contactProfile.getShortDisplayName().empty())
-                                tmpUserName = QString::fromStdString(contactProfile.getShortDisplayName());
+                                tmpUserName = QString::fromUtf8(contactProfile.getShortDisplayName().c_str());
                 }
         }
@@ -249 +249 @@
                 std::string data = _cHistory.getMementoData(id);
                 QString text = QString::fromUtf8(data.c_str(), data.size());
-                QString phoneNumber = QString::fromStdString(_cHistory.getMementoPeer(id));
+                QString phoneNumber = QString::fromUtf8(_cHistory.getMementoPeer(id).c_str());
 
                 //Test existance of Sms (available only if a QuteComAccount has been created)
@@ -271 +271 @@
 
         case HistoryMemento::ChatSession:
-                _chatLogViewer = new QtChatLogViewer(NULL, *qtQuteCom, QString::fromStdString(memento->getData()));
+                _chatLogViewer = new QtChatLogViewer(NULL, *qtQuteCom, QString::fromUtf8(memento->getData().c_str()));
                 _chatLogViewer->show();
                 break;

qutecom/src/presentation/qt/imaccount/QtAIMSettings.cpp

@@ -60 +60 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
 }
 
 void QtAIMSettings::setIMAccount() {
-        _imAccount.setLogin(_ui->loginLineEdit->text().toStdString());
-        _imAccount.setPassword(_ui->passwordLineEdit->text().toStdString());
+        _imAccount.setLogin(std::string(_ui->loginLineEdit->text().toUtf8()));
+        _imAccount.setPassword(std::string(_ui->passwordLineEdit->text().toUtf8()));
 
         IMAccountParameters & params = _imAccount.getIMAccountParameters();

qutecom/src/presentation/qt/imaccount/QtFaceBookSettings.cpp

@@ -53 +53 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
 }
 
 void QtFacebookSettings::setIMAccount() {
-        _imAccount.setLogin(_ui->loginLineEdit->text().toStdString());
-        _imAccount.setPassword(_ui->passwordLineEdit->text().toStdString());
+        _imAccount.setLogin(std::string(_ui->loginLineEdit->text().toUtf8()));
+        _imAccount.setPassword(std::string(_ui->passwordLineEdit->text().toUtf8()));
 
 }

qutecom/src/presentation/qt/imaccount/QtGoogleTalkSettings.cpp

@@ -63 +63 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
 }
 
 void QtGoogleTalkSettings::setIMAccount() {
         static const String AT = "@";
-        String tmpLogin = _ui->loginLineEdit->text().toStdString();
+        String tmpLogin(_ui->loginLineEdit->text().toUtf8());
 
         //Test if login ends with @gmail.com
@@ -77 +77 @@
 
         _imAccount.setLogin(tmpLogin);
-        _imAccount.setPassword(_ui->passwordLineEdit->text().toStdString());
+        _imAccount.setPassword(std::string(_ui->passwordLineEdit->text().toUtf8()));
 
         IMAccountParameters & params = _imAccount.getIMAccountParameters();

qutecom/src/presentation/qt/imaccount/QtICQSettings.cpp

@@ -55 +55 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
 }
 
 void QtICQSettings::setIMAccount() {
-        _imAccount.setLogin(_ui->loginLineEdit->text().toStdString());
-        _imAccount.setPassword(_ui->passwordLineEdit->text().toStdString());
+        _imAccount.setLogin(std::string(_ui->loginLineEdit->text().toUtf8()));
+        _imAccount.setPassword(std::string(_ui->passwordLineEdit->text().toUtf8()));
 
         IMAccountParameters & params = _imAccount.getIMAccountParameters();

qutecom/src/presentation/qt/imaccount/QtIMAccountManager.cpp

@@ -126 +126 @@
                         continue;
                 }
-                accountStrList << QString::fromStdString(EnumIMProtocol::toString(imProtocol));
+                accountStrList << QString::fromUtf8(EnumIMProtocol::toString(imProtocol).c_str());
                 ////
                 
                 // login
-                accountStrList << QString::fromStdString(imAccount.getLogin());
+                accountStrList << QString::fromUtf8(imAccount.getLogin().c_str());
                 ////
                 accountStrList << QString::null;
 
                 QTreeWidgetItem * item = new QTreeWidgetItem(_ui->treeWidget, accountStrList);
-                QString id = QString::fromStdString(imAccount.getUUID());
+                QString id = QString::fromUtf8(imAccount.getUUID().c_str());
                 item->setData(0, Qt::UserRole, id);
         }
@@ -142 +142 @@
 void QtIMAccountManager::addIMAccount(QAction * action) {
         QString protocolName = action->text();
-        LOG_DEBUG(protocolName.toStdString());
+        LOG_DEBUG(protocolName.toUtf8());
 
         QtEnumIMProtocol::IMProtocol imProtocol = QtEnumIMProtocol::toIMProtocol(protocolName);
@@ -154 +154 @@
                 return std::auto_ptr<IMAccount>(0);
         }
-        std::string id = item->data(0, Qt::UserRole).toString().toStdString();
+        std::string id(item->data(0, Qt::UserRole).toString().toUtf8());
         return std::auto_ptr<IMAccount>(_userProfile.getIMAccountManager().getIMAccount(id));
 }
@@ -168 +168 @@
                         tr("@product@"),
                         tr("Are sure you want to delete this account?\n") +
-                        QString::fromStdString(imAccount->getLogin()),
+                        QString::fromUtf8(imAccount->getLogin().c_str()),
                         tr("&Delete"), tr("Cancel"));
 
@@ -189 +189 @@
 
         imAccount = getIMAccountFromItem(item);
-        item->setText(1, QString::fromStdString(imAccount->getLogin()));
+        item->setText(1, QString::fromUtf8(imAccount->getLogin().c_str()));
 }
 

qutecom/src/presentation/qt/imaccount/QtJabberSettings.cpp

@@ -63 +63 @@
         IMAccountParameters & params = _imAccount.getIMAccountParameters();
 
-        QString fullLogin = QString::fromStdString(_imAccount.getLogin());
+        QString fullLogin = QString::fromUtf8(_imAccount.getLogin().c_str());
         // Hackish way to edit the resource in a more explicit way. There really
         // should be another Jabber param in IMAccountParameters to store it.
@@ -76 +76 @@
         else
                 _ui->loginLineEdit->setText(login);
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
         _ui->useTLSCheckBox->setChecked(params.isJabberTLSUsed());
         _ui->requireTLSCheckBox->setChecked(params.isJabberTLSRequired());
         _ui->forceOldSSLCheckBox->setChecked(params.isJabberOldSSLUsed());
         _ui->allowPlainTextAuthenticationCheckBox->setChecked(params.isJabberAuthPlainInClearUsed());
-        _ui->connectServerLineEdit->setText(QString::fromStdString(params.getJabberConnectionServer()));
+        _ui->connectServerLineEdit->setText(QString::fromUtf8(params.getJabberConnectionServer().c_str()));
         _ui->portLineEdit->setText(QString("%1").arg(params.getJabberServerPort()));
         _ui->resourceLineEdit->setText(resource);
@@ -94 +94 @@
 
 void QtJabberSettings::setIMAccount() {
-        std::string login = _ui->loginLineEdit->text().toStdString();
-        std::string resource = _ui->resourceLineEdit->text().toStdString();
+        std::string login(_ui->loginLineEdit->text().toUtf8());
+        std::string resource(_ui->resourceLineEdit->text().toUtf8());
         if (!resource.empty()) {
                 login += '/' + resource;
         }
-        std::string password = _ui->passwordLineEdit->text().toStdString();
+        std::string password(_ui->passwordLineEdit->text().toUtf8());
 
         _imAccount.setLogin(login);
@@ -109 +109 @@
         params.set(IMAccountParameters::JABBER_USE_OLD_SSL_KEY, _ui->forceOldSSLCheckBox->isChecked());
         params.set(IMAccountParameters::JABBER_AUTH_PLAIN_IN_CLEAR_KEY, _ui->allowPlainTextAuthenticationCheckBox->isChecked());
-        params.set(IMAccountParameters::JABBER_CONNECTION_SERVER_KEY, _ui->connectServerLineEdit->text().toStdString());
+        params.set(IMAccountParameters::JABBER_CONNECTION_SERVER_KEY, std::string(_ui->connectServerLineEdit->text().toUtf8()));
         params.set(IMAccountParameters::JABBER_PORT_KEY, _ui->portLineEdit->text().toInt());
 }

qutecom/src/presentation/qt/imaccount/QtMSNSettings.cpp

@@ -61 +61 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
         IMAccountParameters & params = _imAccount.getIMAccountParameters();
         _ui->useHttpMethodCheckBox->setChecked(params.isMSNHttpUsed());
@@ -69 +69 @@
 void QtMSNSettings::setIMAccount() {
         static const std::string AT = "@";
-        String tmpLogin = _ui->loginLineEdit->text().toStdString();
+        String tmpLogin(_ui->loginLineEdit->text().toUtf8());
 
         //Test if login ends with @hotmail.com
@@ -77 +77 @@
 
         _imAccount.setLogin(tmpLogin);
-        _imAccount.setPassword(_ui->passwordLineEdit->text().toStdString());
+        _imAccount.setPassword(std::string(_ui->passwordLineEdit->text().toUtf8()));
 
         IMAccountParameters & params = _imAccount.getIMAccountParameters();

qutecom/src/presentation/qt/imaccount/QtMySpaceSettings.cpp

@@ -53 +53 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
 }
 
 void QtMySpaceSettings::setIMAccount() {
-        _imAccount.setLogin(_ui->loginLineEdit->text().toStdString());
-        _imAccount.setPassword(_ui->passwordLineEdit->text().toStdString());
+        _imAccount.setLogin(std::string(_ui->loginLineEdit->text().toUtf8()));
+        _imAccount.setPassword(std::string(_ui->passwordLineEdit->text().toUtf8()));
 
 }

qutecom/src/presentation/qt/imaccount/QtSkypeSettings.cpp

@@ -54 +54 @@
         _ui->createAccountLabel->setVisible(false);//VOXOX CHANGE by Rolando - 2009.07.24 - Modified to complete task "Update Skype Settings window popup"
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        //_ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        //_ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword()));
 }
 
 void QtSkypeSettings::setIMAccount() {
-        _imAccount.setLogin(_ui->loginLineEdit->text().toStdString());
+        _imAccount.setLogin(std::string(_ui->loginLineEdit->text().toUtf8()));
         //VOXOX CHANGE CJC SKYPE PLUGGING DOES NOT NEED A PASSWORD
         _imAccount.setPassword("");

qutecom/src/presentation/qt/imaccount/QtTwitterSettings.cpp

@@ -53 +53 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
 }
 
 void QtTwitterSettings::setIMAccount() {
-        _imAccount.setLogin(_ui->loginLineEdit->text().toStdString());
-        _imAccount.setPassword(_ui->passwordLineEdit->text().toStdString());
+        _imAccount.setLogin(std::string(_ui->loginLineEdit->text().toUtf8()));
+        _imAccount.setPassword(std::string(_ui->passwordLineEdit->text().toUtf8()));
 
 }

qutecom/src/presentation/qt/imaccount/QtYahooSettings.cpp

@@ -60 +60 @@
         SAFE_CONNECT(_ui->createAccountLabel, SIGNAL(linkActivated(const QString&)), SLOT(createAccountButtonClicked()));
 
-        _ui->loginLineEdit->setText(QString::fromStdString(_imAccount.getLogin()));
-        _ui->passwordLineEdit->setText(QString::fromStdString(_imAccount.getPassword()));
+        _ui->loginLineEdit->setText(QString::fromUtf8(_imAccount.getLogin().c_str()));
+        _ui->passwordLineEdit->setText(QString::fromUtf8(_imAccount.getPassword().c_str()));
 }
 
@@ -69 +69 @@
 
 void QtYahooSettings::setIMAccount() {
-        String login = _ui->loginLineEdit->text().toStdString();
-        std::string password = _ui->passwordLineEdit->text().toStdString();
+        String login(_ui->loginLineEdit->text().toUtf8());
+        std::string password(_ui->passwordLineEdit->text().toUtf8());
 
         //static const String AT = "@";

qutecom/src/presentation/qt/imcontact/QtAddIMContact.cpp

@@ -50 +50 @@
 #ifdef CUSTOM_ACCOUNT
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/qutecom.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolQuteCom)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolQuteCom)));
 #endif
 
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/sip.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolSIP)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolSIP).c_str()));
                 
 #ifdef MULTIIMWRAPPER
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/msn.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolMSN)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolMSN).c_str()));
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/aim.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolAIM)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolAIM).c_str()));
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/icq.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolICQ)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolICQ).c_str()));
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/yahoo.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolYahoo)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolYahoo).c_str()));
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/jabber.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolJabber)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolJabber).c_str()));
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/google-talk.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolGoogleTalk)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolGoogleTalk).c_str()));
 
 #if defined(ENABLE_FACEBOOK)
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/facebook.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolFaceBook)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolFaceBook)));
 #endif
 #if defined(ENABLE_MYSPACE)
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/myspace.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolMySpace)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolMySpace)));
 #endif
 #if defined(ENABLE_SKYPE)
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/skype.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolSkype)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolSkype)));
 #endif
 #if defined(ENABLE_TWITTER)
         _ui->protocolComboBox->addItem(QIcon(":pics/protocols/twitter.png"),
-                QString::fromStdString(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolTwitter)));
+                QString::fromUtf8(EnumIMProtocol::toString(EnumIMProtocol::IMProtocolTwitter)));
 #endif
 #endif //MULTIIMWRAPPER
@@ -114 +114 @@
         QString protocolName = _ui->protocolComboBox->currentText();
 
-        EnumIMProtocol::IMProtocol imProtocol = EnumIMProtocol::toIMProtocol(protocolName.toStdString());
+        EnumIMProtocol::IMProtocol imProtocol = EnumIMProtocol::toIMProtocol(std::string(protocolName.toUtf8()));
         
         // sip contact should know their domain
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString qutecomSuffix = "@" + QString::fromStdString( config.getQuteComRealm() );
+        QString qutecomSuffix = "@" + QString::fromUtf8( config.getQuteComRealm().c_str() );
         if (imProtocol == EnumIMProtocol::IMProtocolQuteCom) {
                 contactId += qutecomSuffix;
@@ -125 +125 @@
                         SipAccount * sipaccount = _cUserProfile.getUserProfile().getSipAccount();
                         if (sipaccount) {
-                                contactId += QString("@") + QString::fromStdString(sipaccount->getRealm());
+                                contactId += QString("@") + QString::fromUtf8(sipaccount->getRealm().c_str());
                         }
                 }
@@ -131 +131 @@
         ////
         
-        IMContact imContact(imProtocol, contactId.toStdString());
+        IMContact imContact(imProtocol, std::string(contactId.toUtf8()));
 
         IMAccountList imAccounts = getSelectedIMAccounts(imProtocol);
@@ -151 +151 @@
 
 void QtAddIMContact::imProtocolChanged(const QString & protocolName) {
-        loadIMAccounts(EnumIMProtocol::toIMProtocol(protocolName.toStdString()));
+        loadIMAccounts(EnumIMProtocol::toIMProtocol(std::string(protocolName.toUtf8())));
 }
 
@@ -171 +171 @@
                 }
 
-                item->setText(1, QString::fromStdString((*it).getLogin()));
+                item->setText(1, QString::fromUtf8((*it).getLogin().c_str()));
         }
 }
@@ -183 +183 @@
                 it != imAccounts.end(); ++it) {
 
-                QList<QTreeWidgetItem *> list = _ui->treeWidget->findItems(QString::fromStdString((*it).getLogin()), Qt::MatchExactly, 1);
+                QList<QTreeWidgetItem *> list = _ui->treeWidget->findItems(QString::fromUtf8((*it).getLogin().c_str()), Qt::MatchExactly, 1);
 
                 if (list.size() > 0) {

qutecom/src/presentation/qt/imcontact/QtAdvancedIMContactManager.cpp

@@ -68 +68 @@
                 IMContact * imContact = (IMContact *) &(*it);
                 QStringList imContactStrList;
-                imContactStrList << QString::fromStdString(imContact->getContactId());
+                imContactStrList << QString::fromUtf8(imContact->getContactId().c_str());
                 EnumIMProtocol::IMProtocol imProtocol = imContact->getProtocol();
 
@@ -76 +76 @@
                 }
 
-                imContactStrList << QString::fromStdString(EnumIMProtocol::toString(imProtocol));
+                imContactStrList << QString::fromUtf8(EnumIMProtocol::toString(imProtocol).c_str());
                 imContactStrList << QString::null;
 
@@ -99 +99 @@
                                         tr("@product@"),
                                         tr("Are sure you want to delete this IM contact?\n") +
-                                        QString::fromStdString(imContact->getContactId()),
+                                        QString::fromUtf8(imContact->getContactId().c_str()),
                                         tr("&Delete"), tr("Cancel"));
 

qutecom/src/presentation/qt/imcontact/QtSimpleIMContactManager.cpp

@@ -204 +204 @@
         for (std::set<IMContact *>::const_iterator it = imContactSet.begin(); it != imContactSet.end(); it++) {
                 IMContact * imContact = *it;
-                imContacts += QString::fromStdString(imContact->getDisplayContactId());
+                imContacts += QString::fromUtf8(imContact->getDisplayContactId().c_str());
                 imContacts += IMCONTACT_TEXT_SEPARATOR;
         }
@@ -301 +301 @@
                 if (!contactIdListAfter.contains(contactId)) {
                         //Remove the imContact from the contactProfile
-                        IMContact imContact(imProtocol, contactId.toStdString());
+                        IMContact imContact(imProtocol, std::string(contactId.toUtf8()));
                         _contactProfile.removeIMContact(imContact);
                 }
@@ -313 +313 @@
         //Add IMContacts
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString qutecomSuffix = "@" + QString::fromStdString( config.getQuteComRealm() );
+        QString qutecomSuffix = "@" + QString::fromUtf8( config.getQuteComRealm().c_str() );
         for (int i = 0; i < contactIdListAfter.size(); i++) {
                 QString contactId = contactIdListAfter[i];
@@ -326 +326 @@
                                         SipAccount * sipaccount = _cUserProfile.getUserProfile().getSipAccount();
                                         if (sipaccount) {
-                                                contactId += QString("@") + QString::fromStdString(sipaccount->getRealm());
+                                                contactId += QString("@") + QString::fromUtf8(sipaccount->getRealm().c_str());
                                         }
                                 }
@@ -333 +333 @@
                         
                         //Add the imContact to the contactProfile
-                        IMContact imContact(imProtocol, contactId.toStdString());
+                        IMContact imContact(imProtocol, std::string(contactId.toUtf8()));
 
                         //IMAccount to associate with the IMContact

qutecom/src/presentation/qt/login/QtAddAccountUtils.cpp

@@ -41 +41 @@
         }
 
-        std::string groupName = QCoreApplication::translate("QtAddAccountUtils", "Test").toStdString();
+        std::string groupName(QCoreApplication::translate("QtAddAccountUtils", "Test").toUtf8());
         userProfile->getContactList().addContactGroup(groupName);
         std::string groupId = userProfile->getContactList().getContactGroupIdFromName(groupName);
 
         if (!audioTestCallAddress.empty()) {
-                std::string name = QCoreApplication::translate("QtAddAccountUtils", "Audio Test Call").toStdString();
+                std::string name(QCoreApplication::translate("QtAddAccountUtils", "Audio Test Call").toUtf8());
                 addContact(userProfile, groupId, name, audioTestCallAddress);
         }
 
         if (!videoTestCallAddress.empty()) {
-                std::string name = QCoreApplication::translate("QtAddAccountUtils", "Video Test Call").toStdString();
+                std::string name(QCoreApplication::translate("QtAddAccountUtils", "Video Test Call").toUtf8());
                 addContact(userProfile, groupId, name, videoTestCallAddress);
         }

qutecom/src/presentation/qt/login/QtAddQuteComAccount.cpp

@@ -81 +81 @@
 
 void QtAddQuteComAccount::loginClicked() {
-        std::string login = _ui->email->text().trimmed().toStdString();
+        std::string login(_ui->email->text().trimmed().toUtf8());
         
         // check if login is an email address
@@ -94 +94 @@
         ////
         
-        std::string password = _ui->password->text().trimmed().toStdString();
+        std::string password( _ui->password->text().trimmed().toUtf8());
         if (!login.empty() && !password.empty()) {
                 QuteComAccount qutecomAccount(login, password, true/*_ui->rememberPassword->isChecked()*/);
@@ -140 +140 @@
         if (sipAccount.getType() == SipAccount::SipAccountTypeQuteCom) {
                 const QuteComAccount & qutecomAccount = dynamic_cast<const QuteComAccount &>(sipAccount);
-                _ui->email->setText(QString::fromStdString(qutecomAccount.getQuteComLogin()));
-                _ui->password->setText(QString::fromStdString(qutecomAccount.getQuteComPassword()));
+                _ui->email->setText(QString::fromUtf8(qutecomAccount.getQuteComLogin().c_str()));
+                _ui->password->setText(QString::fromUtf8(qutecomAccount.getQuteComPassword().c_str()));
                 setInfoMessage();
         } else {
@@ -157 +157 @@
                         //loads the qutecom acccount
                         QuteComAccount * qutecomAccount = userProfile->getQuteComAccount();
-                        _ui->email->setText(QString::fromStdString(qutecomAccount->getQuteComLogin()));
-                        _ui->password->setText(QString::fromStdString(qutecomAccount->getQuteComPassword()));
+                        _ui->email->setText(QString::fromUtf8(qutecomAccount->getQuteComLogin().c_str()));
+                        _ui->password->setText(QString::fromUtf8(qutecomAccount->getQuteComPassword().c_str()));
                         setInfoMessage();
                 } else {

qutecom/src/presentation/qt/login/QtLogAccount.cpp

@@ -140 +140 @@
                 //default value
                 _ui->accountComboBox->setCurrentIndex(_ui->accountComboBox->findText(QString::fromLocal8Bit(lastUsedIndex.c_str())));
-                currentIndexChanged(QString::fromStdString(lastUsedIndex));
+                currentIndexChanged(QString::fromUtf8(lastUsedIndex.c_str()));
                 
                 SAFE_CONNECT(_ui->accountComboBox, SIGNAL(currentIndexChanged(const QString &)), 
@@ -161 +161 @@
                 if (sipaccount) {
                         if (sipaccount->isPasswordRemembered()) {
-                                setPassword(QString::fromStdString(sipaccount->getUserPassword()));
+                                setPassword(QString::fromUtf8(sipaccount->getUserPassword().c_str()));
                                 setRememberPassword(true);
                         } else {
-                                setPassword(QString::fromStdString(""));
+                                setPassword(QString::fromUtf8(""));
                                 setRememberPassword(false);
                         }
@@ -264 +264 @@
         if (userProfile) {
                 // Add and select the given SipAccount
-                _ui->accountComboBox->addItem(QString::fromStdString(sipAccountName));
-                _ui->accountComboBox->setCurrentIndex(_ui->accountComboBox->findText(QString::fromStdString(sipAccountName)));
+                _ui->accountComboBox->addItem(QString::fromUtf8(sipAccountName.c_str()));
+                _ui->accountComboBox->setCurrentIndex(_ui->accountComboBox->findText(QString::fromUtf8(sipAccountName.c_str())));
                 setInfoMessage();
 
                 SipAccount * sipAccount = userProfile->getSipAccount();
-                setPassword(QString::fromStdString(sipAccount->getUserPassword()));
+                setPassword(QString::fromUtf8(sipAccount->getUserPassword().c_str()));
         } else {
                 _loginDialog->changePage(QtLoginDialog::AddAccount);

qutecom/src/presentation/qt/phonecall/QtPhoneCall.cpp

@@ -166 +166 @@
 
         if (userName.isEmpty()) {
-                userName = QString::fromStdString(_cPhoneCall.getPhoneCall().getPeerSipAddress().getUserName());
+                userName = QString::fromUtf8(_cPhoneCall.getPhoneCall().getPeerSipAddress().getUserName().c_str());
         }
         QPixmap avatarPixmap = loadContactAvatar(userName);
@@ -323 +323 @@
                 CContactList & cContactList = qtContactList->getCContactList();
 
-                IMContact imContact(EnumIMProtocol::IMProtocolQuteCom, userName.toStdString());
+                IMContact imContact(EnumIMProtocol::IMProtocolQuteCom, std::string(userName.toUtf8()));
                 std::string contactId = cContactList.findContactThatOwns(imContact);
                 ContactProfile contactProfile = cContactList.getContactProfile(contactId);
@@ -357 +357 @@
 
 void QtPhoneCall::updateNickNameToolTip() {
-        QString toolTip = QString::fromStdString(_cPhoneCall.getPeerSipAddress());
+        QString toolTip = QString::fromUtf8(_cPhoneCall.getPeerSipAddress().c_str());
         if (!_codecs.isEmpty()) {
                 toolTip += QString(" (%1)").arg(_codecs);
@@ -373 +373 @@
         if(cUserProfile)
         {
-                std::string  uuid = cUserProfile->getCContactList().findContactThatOwns(str.toStdString());
+                std::string  uuid = cUserProfile->getCContactList().findContactThatOwns(std::string(str.toUtf8()));
                 if(!uuid.empty())
                 {
                         ContactProfile contactProfile = cUserProfile->getCContactList().getContactProfile(uuid);
                         if(!contactProfile.getShortDisplayName().empty())
-                                tmpUserName = QString::fromStdString(contactProfile.getShortDisplayName());
+                                tmpUserName = QString::fromUtf8(contactProfile.getShortDisplayName().c_str());
                 }
         }
@@ -392 +392 @@
                 codecs += "/" + CodecList::toString(_cPhoneCall.getVideoCodecUsed());
         }
-        _codecs = QString::fromStdString(codecs);
+        _codecs = QString::fromUtf8(codecs.c_str());
         updateNickNameToolTip();
 
@@ -761 +761 @@
         SipAddress sipAddress = call.getPeerSipAddress();
 
-        QString rawSipAddress = QString::fromStdString(sipAddress.getRawSipAddress());
+        QString rawSipAddress = QString::fromUtf8(sipAddress.getRawSipAddress().c_str());
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString qutecomRealm = QString::fromStdString( config.getQuteComRealm() );
+        QString qutecomRealm = QString::fromUtf8( config.getQuteComRealm().c_str() );
         if (rawSipAddress.contains(qutecomRealm)) {
                 // QuteCom server
@@ -780 +780 @@
         } else {
                 // External SIP server
-                QString address = QString::fromStdString(sipAddress.getSipAddress());
+                QString address = QString::fromUtf8(sipAddress.getSipAddress().c_str());
                 if (address.startsWith("sip:")) {
                         address = address.mid(4);
@@ -860 +860 @@
 void QtPhoneCall::createConf()
 {
-        QString address = QString::fromStdString(_cPhoneCall.getPeerSipAddress());
+        QString address = QString::fromUtf8(_cPhoneCall.getPeerSipAddress().c_str());
         
         if(address.contains("@"))
@@ -872 +872 @@
 
         QtConferenceCallWidget conferenceDialog(_qtQuteCom->getWidget(), _qtQuteCom->getCQuteCom(), &_cPhoneCall.getPhoneCall().getPhoneLine(),false);
-        conferenceDialog.setFirstPeer(address.toStdString());
+        conferenceDialog.setFirstPeer(std::string(address.toUtf8()));
         if(conferenceDialog.exec())
         {

qutecom/src/presentation/qt/phoneline/QtPhoneLine.cpp

@@ -119 +119 @@
         ////
 
-        _cPhoneLine.makeCall((url.split("//")[1]).toStdString());
+        _cPhoneLine.makeCall(std::string((url.split("//")[1]).toUtf8()));
 }

qutecom/src/presentation/qt/profile/QtProfileDetails.cpp

@@ -71 +71 @@
                 it != tmp.end(); ++it) {
 
-                _ui->groupComboBox->addItem(QString::fromUtf8((*it).second.c_str()), QString::fromStdString((*it).first.c_str()));
+                _ui->groupComboBox->addItem(QString::fromUtf8((*it).second.c_str()), QString::fromUtf8((*it).first.c_str()));
                 std::string str1 = (*it).first;
                 std::string str2 = contactProfile.getGroupId();
@@ -166 +166 @@
         _ui->stateLineEdit->setText(QString::fromUtf8(address.getStateProvince().c_str()));
 
-        _ui->mobilePhoneLineEdit->setText(QString::fromStdString(_profile.getMobilePhone()));
-        _ui->homePhoneLineEdit->setText(QString::fromStdString(_profile.getHomePhone()));
-
-        _ui->emailLineEdit->setText(QString::fromStdString(_profile.getPersonalEmail()));
-        _ui->webLineEdit->setText(QString::fromStdString(_profile.getWebsite()));
+        _ui->mobilePhoneLineEdit->setText(QString::fromUtf8(_profile.getMobilePhone().c_str()));
+        _ui->homePhoneLineEdit->setText(QString::fromUtf8(_profile.getHomePhone().c_str()));
+
+        _ui->emailLineEdit->setText(QString::fromUtf8(_profile.getPersonalEmail().c_str()));
+        _ui->webLineEdit->setText(QString::fromUtf8(_profile.getWebsite().c_str()));
 
         _ui->notesEdit->setPlainText(QString::fromUtf8(_profile.getNotes().c_str()));
@@ -201 +201 @@
         _profile.setStreetAddress(address);
 
-        _profile.setMobilePhone(_ui->mobilePhoneLineEdit->text().remove(" ").toStdString());
-        _profile.setHomePhone(_ui->homePhoneLineEdit->text().remove(" ").toStdString());
-
-        _profile.setPersonalEmail(_ui->emailLineEdit->text().toStdString());
-        _profile.setWebsite(_ui->webLineEdit->text().toStdString());
+        _profile.setMobilePhone(std::string(_ui->mobilePhoneLineEdit->text().remove(" ").toUtf8()));
+        _profile.setHomePhone(std::string(_ui->homePhoneLineEdit->text().remove(" ").toUtf8()));
+
+        _profile.setPersonalEmail(std::string(_ui->emailLineEdit->text().toUtf8()));
+        _profile.setWebsite(std::string(_ui->webLineEdit->text().toUtf8()));
 
         _profile.setNotes(_ui->notesEdit->toPlainText().toUtf8().constData());
@@ -243 +243 @@
                 std::string groupName = std::string(_ui->groupComboBox->currentText().toUtf8().data());
                 _cUserProfile.getCContactList().addContactGroup(groupName);
-                groupId = QString::fromStdString(_cUserProfile.getCContactList().getContactGroupIdFromName(groupName));
-        }
-
-        contactProfile.setGroupId(groupId.toString().toStdString());
+                groupId = QString::fromUtf8(_cUserProfile.getCContactList().getContactGroupIdFromName(groupName).c_str());
+        }
+
+        contactProfile.setGroupId(std::string(groupId.toString().toUtf8()));
 
         _profileDetailsWindow->accept();
@@ -263 +263 @@
 void QtProfileDetails::changeUserProfileAvatar() {
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString startDir = QString::fromStdString(config.getResourcesDir()) + "pics/avatars";
+        QString startDir = QString::fromUtf8(config.getResourcesDir().c_str()) + "pics/avatars";
 
         ImageSelector avatarSelector(_profileDetailsWindow);
@@ -314 +314 @@
         OWPicture picture = OWPicture::pictureFromData(data);
         QFileInfo fileInfo(path);
-        picture.setFilename(fileInfo.fileName().toStdString());
+        picture.setFilename(std::string(fileInfo.fileName().toUtf8()));
 
         _profile.setIcon(picture);
@@ -360 +360 @@
 
 void QtProfileDetails::websiteButtonClicked() {
-        String website = _ui->webLineEdit->text().toStdString();
+        String website(_ui->webLineEdit->text().toUtf8());
         if (!website.empty()) {
                 if (!website.contains("http://")) {
@@ -370 +370 @@
 
 void QtProfileDetails::emailButtonClicked() {
-        std::string email = _ui->emailLineEdit->text().toStdString();
+        std::string email(_ui->emailLineEdit->text().toUtf8());
         if (!email.empty()) {
                 WebBrowser::openUrl("mailto:" + email);

qutecom/src/presentation/qt/profile/QtUserProfile.cpp

@@ -96 +96 @@
 void QtUserProfile::authorizationRequestEventHandler(PresenceHandler & sender,
         const IMContact & imContact, const std::string & message) {
-        authorizationRequestEventHandlerSignal(&sender, imContact, QString::fromStdString(message));
+        authorizationRequestEventHandlerSignal(&sender, imContact, QString::fromUtf8(message.c_str()));
 }
 
 void QtUserProfile::incomingSubscribeEventHandler(PresenceHandler & sender,const std::string & imaccountId,int sid,const std::string & from,const std::string & evtType) 
 {
-        incomingSubscribeEventHandlerSignal(&sender, QString::fromStdString(imaccountId), sid,QString::fromStdString(from), QString::fromStdString(evtType));
+        incomingSubscribeEventHandlerSignal(&sender, QString::fromUtf8(imaccountId.c_str()), sid,QString::fromUtf8(from.c_str()), QString::fromUtf8(evtType.c_str()));
 }
 
@@ -163 +163 @@
                         //TODO: give a personal message
 
-                        IMAccount * imAccount = _cUserProfile.getUserProfile().getIMAccountManager().getIMAccount(imaccountId.toStdString());
+                        IMAccount * imAccount = _cUserProfile.getUserProfile().getIMAccountManager().getIMAccount(std::string(imaccountId.toUtf8()));
                         if(imAccount)
                         {
-                                IMContact imContact(*imAccount,from.toStdString());
+                                IMContact imContact(*imAccount,std::string(from.toUtf8()));
                                 if (_cUserProfile.getCContactList().findContactThatOwns(imContact).empty()) 
                                 {
@@ -180 +180 @@
                         //sender->authorizeContact(imContact, true, String::null);
                         //_cUserProfile.getUserProfile()
-                        sender->acceptSubscription(sid,imaccountId.toStdString());
+                        sender->acceptSubscription(sid,std::string(imaccountId.toUtf8()));
 
                 } else {
-                        sender->rejectSubscription(sid,imaccountId.toStdString());
+                        sender->rejectSubscription(sid,std::string(imaccountId.toUtf8()));
                         //TODO: give a personal message
                         //TODO: avoid direct access to model (as we are in the GUI thread)
@@ -196 +196 @@
         if (imAccount) {
                 QString request = QString("%1 (from %2) wants to see the presence state of %3.\n")
-                        .arg(QString::fromStdString(imContact.getContactId()))
-                        .arg(QString::fromStdString(EnumIMProtocol::toString(imContact.getProtocol())))
-                        .arg(QString::fromStdString(imAccount->getLogin()));
+                        .arg(QString::fromUtf8(imContact.getContactId().c_str()))
+                        .arg(QString::fromUtf8(EnumIMProtocol::toString(imContact.getProtocol()).c_str()))
+                        .arg(QString::fromUtf8(imAccount->getLogin().c_str()));
 
                 if (!message.isEmpty()) {

qutecom/src/presentation/qt/profile/QtUserProfileHandler.cpp

@@ -87 +87 @@
 
 void QtUserProfileHandler::profileLoadedFromBackupsEventHandler(std::string profileName) {
-        profileLoadedFromBackupsEventHandlerSignal(QString::fromStdString(profileName));
+        profileLoadedFromBackupsEventHandlerSignal(QString::fromUtf8(profileName.c_str()));
 }
 
 void QtUserProfileHandler::profileCannotBeLoadedEventHandler(std::string profileName) {
-        profileCannotBeLoadedEventHandlerSignal(QString::fromStdString(profileName));
+        profileCannotBeLoadedEventHandlerSignal(QString::fromUtf8(profileName.c_str()));
 }
 

qutecom/src/presentation/qt/profilebar/QtIMAccountPresenceMenuManager.cpp

@@ -96 +96 @@
 void QtIMAccountPresenceMenuManager::deleteAccount() {
         std::auto_ptr<IMAccount> imAccount ( _cUserProfile.getUserProfile().getIMAccountManager().getIMAccount(_imAccountId) );
-        QString login = QString::fromStdString(imAccount->getLogin());
+        QString login = QString::fromUtf8(imAccount->getLogin().c_str());
         QString message =
                 tr("Are sure you want to delete the account <b>%1</b>?")

qutecom/src/presentation/qt/profilebar/QtIMProfileWidget.cpp

@@ -122 +122 @@
         QPixmap protocolPix;
         if (!protocolPix.load(name)) {
-                LOG_WARN(QString("Could not load icon " + name).toStdString());
+                LOG_WARN(QString("Could not load icon " + name).toUtf8());
                 return QPixmap();
         }
@@ -132 +132 @@
         case QtIMAccountMonitor::StateConnected:
                 {
-                        QString presenceString = QString::fromStdString(EnumPresenceState::toString(presenceState));
+                        QString presenceString = QString::fromUtf8(EnumPresenceState::toString(presenceState).c_str());
                         overlay.load(
                                 QString(":pics/protocols/overlay_presence_%1.png").arg(presenceString)
@@ -263 +263 @@
         AccountIdToButton::const_iterator it = _accountIdToButton.find(imAccountId);
         if (it != _accountIdToButton.end()) {
-                LOG_WARN("there is already a button for account " + imAccountId.toStdString());
+                LOG_WARN("there is already a button for account " + imAccountId.toUtf8());
                 return;
         }
@@ -269 +269 @@
         // Look for the account
         IMAccount * imAccount =
-                _cUserProfile->getUserProfile().getIMAccountManager().getIMAccount(imAccountId.toStdString());
+        _cUserProfile->getUserProfile().getIMAccountManager().getIMAccount(std::string(imAccountId.toUtf8()));
 
         if (!imAccount) {
@@ -287 +287 @@
         // Create button
 
-        QString id = QString::fromStdString(account->getUUID());
+        QString id = QString::fromUtf8(account->getUUID().c_str());
         AccountIdToButton::const_iterator it = _accountIdToButton.find(id);
         if (it != _accountIdToButton.end()) {
-                LOG_WARN("there is already a button for account " + id.toStdString());
+                LOG_WARN("there is already a button for account " + id.toUtf8());
                 return;
         }
@@ -301 +301 @@
         // Add menu
         QMenu* menu = new QMenu(button);
-        QAction* action = menu->addAction(QString::fromStdString(account->getLogin()));
+        QAction* action = menu->addAction(QString::fromUtf8(account->getLogin().c_str()));
         action->setEnabled(false);
         menu->addAction(action);
@@ -320 +320 @@
         AccountIdToButton::iterator it = _accountIdToButton.find(imAccountId);
         if (it == _accountIdToButton.end()) {
-                LOG_WARN("No button exists for account with id " + imAccountId.toStdString());
+                LOG_WARN("No button exists for account with id " + imAccountId.toUtf8());
                 return;
         }
@@ -333 +333 @@
         if (it == _accountIdToButton.end()) {
                 // Button does not exist
-                LOG_WARN("There is no button for account " + imAccountId.toStdString());
+                LOG_WARN("There is no button for account " + imAccountId.toUtf8());
                 return;
         }
@@ -340 +340 @@
         // Look for the account
         IMAccount * imAccount =
-                _cUserProfile->getUserProfile().getIMAccountManager().getIMAccount(imAccountId.toStdString());
+        _cUserProfile->getUserProfile().getIMAccountManager().getIMAccount(std::string(imAccountId.toUtf8()));
 
         if (!imAccount) {
                 // Account does not exist, this probably means the account has been
                 // removed
-                LOG_DEBUG("Account " + imAccountId.toStdString() + " does not exist");
+                LOG_DEBUG("Account " + imAccountId.toUtf8() + " does not exist");
                 return;
         }
@@ -351 +351 @@
         // Get account info
         EnumIMProtocol::IMProtocol imProtocol = imAccount->getProtocol();
-        QString protocolString = QString::fromStdString(EnumIMProtocol::toString(imProtocol));
-        QString login = QString::fromStdString(imAccount->getLogin());
+        QString protocolString = QString::fromUtf8(EnumIMProtocol::toString(imProtocol).c_str());
+        QString login = QString::fromUtf8(imAccount->getLogin().c_str());
         EnumPresenceState::PresenceState presenceState = imAccount->getPresenceState();
 

qutecom/src/presentation/qt/profilebar/QtProfileBar.cpp

@@ -312 +312 @@
                         if(!list.contains(imAccount->getUUID()))
                         {
-                                QString login = QString::fromStdString(imAccount->getLogin());
-                                QString protocol = QString::fromStdString( EnumIMProtocol::toString(imAccount->getProtocol()) );
-                                QString id = QString::fromStdString(imAccount->getUUID());
+                                QString login = QString::fromUtf8(imAccount->getLogin().c_str());
+                                QString protocol = QString::fromUtf8( EnumIMProtocol::toString(imAccount->getProtocol()).c_str() );
+                                QString id = QString::fromUtf8(imAccount->getUUID().c_str());
                                 QtIMAccountMonitor::IMAccountInfoAutoPtr info = _qtImAccountMonitor->getIMAccountInfo(id);
 
@@ -437 +437 @@
 void QtProfileBar::wsInfoLandlineNumberEventHandler(WsInfo & sender, int id, WsInfo::WsInfoStatus status, std::string number) {
         if (status == WsInfo::WsInfoStatusOk) {
-                wsInfoLandlineNumberEvent(QString::fromStdString(number));
+                wsInfoLandlineNumberEvent(QString::fromUtf8(number.c_str()));
         }
 }
@@ -451 +451 @@
                         break;
                 case WsInfo::WsInfoCallForwardModeNumber:
-                        wsCallForwardInfoEvent(tr("active") + " (" + QString::fromStdString(dest1) + ")");
+                        wsCallForwardInfoEvent(tr("active") + " (" + QString::fromUtf8(dest1.c_str()) + ")");
                         break;
                 case WsInfo::WsInfoCallForwardModeDisabled:

qutecom/src/presentation/qt/webdirectory/QtWebDirectory.cpp

@@ -48 +48 @@
 
 void QtWebDirectory::init() {
-        load(QUrl(QString::fromStdString(WsUrl::getQuteComDirectoryUrl())));
+        load(QUrl(QString::fromUtf8(WsUrl::getQuteComDirectoryUrl().c_str())));
         setWindowTitle(tr("@product@ - Directory"));
 }
@@ -57 +57 @@
 
 void QtWebDirectory::CloseEventFilterSlot() {
-        load(QUrl(QString::fromStdString(WsUrl::getQuteComDirectoryUrl())));
+        load(QUrl(QString::fromUtf8(WsUrl::getQuteComDirectoryUrl().c_str())));
 }

qutecom/src/presentation/qt/webservices/sms/QtSms.cpp

@@ -297 +297 @@
 
                 UserProfile & userProfile = cUserProfile->getUserProfile();
-                userProfile.setSmsSignature(signature.toStdString());
+                userProfile.setSmsSignature(std::string(signature.toUtf8()));
         }
 }
@@ -313 +313 @@
                 if (!signature.empty()) {
 
-                        _ui->signatureLineEdit->setText(QString::fromStdString(signature));
+                        _ui->signatureLineEdit->setText(QString::fromUtf8(signature.c_str()));
                 }
         }

qutecom/src/presentation/qt/webservices/softupdate/QtBrowserSoftUpdate.cpp

@@ -47 +47 @@
 
         QString originalLabelText = _ui->updateTextLabel->text()
-                                .arg(QString::fromStdString(version))
+                                .arg(QString::fromUtf8(version.c_str()))
                                 .arg(fileSize);
         _ui->updateTextLabel->setText(originalLabelText);

qutecom/src/presentation/qt/webservices/softupdate/QtSoftUpdate.cpp

@@ -96 +96 @@
         //updateTextLabel
         _originalLabelText = _ui->updateTextLabel->text()
-                                .arg(QString::fromStdString(version))
-                                .arg(QString::fromStdString(downloadUrl))
+                                .arg(QString::fromUtf8(version))
+                                .arg(QString::fromUtf8(downloadUrl))
                                 .arg(fileSize);
         _ui->updateTextLabel->setText(_originalLabelText);
@@ -103 +103 @@
         //Deletes previous update program
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString update_path = QString::fromStdString(config.getConfigDir())+ UPDATE_PROGRAM;
+        QString update_path = QString::fromUtf8(config.getConfigDir())+ UPDATE_PROGRAM;
         QFile file(update_path);
         file.remove();
         file.close();
 
-        _softUpdater = new SoftUpdater(downloadUrl, update_path.toStdString());
+        _softUpdater = new SoftUpdater(downloadUrl, update_path.toUtf8());
         _softUpdater->dataReadProgressEvent += boost::bind(&QtSoftUpdate::dataReadProgressEventHandler, this, _1, _2, _3);
         _softUpdater->downloadFinishedEvent += boost::bind(&QtSoftUpdate::downloadFinishedEventHandler, this, _1);
@@ -163 +163 @@
 void QtSoftUpdate::launchUpdateProcess() {
         Config & config = ConfigManager::getInstance().getCurrentConfig();
-        QString update_path = "\""+QString::fromStdString(config.getConfigDir())+ UPDATE_PROGRAM+"\"";
+        QString update_path = "\""+QString::fromUtf8(config.getConfigDir().c_str())+ UPDATE_PROGRAM+"\"";
         QProcess * updateProcess = new QProcess();
         SAFE_CONNECT(updateProcess, SIGNAL(error(QProcess::ProcessError)), SLOT(updateProcessError(QProcess::ProcessError)));

qutecom/src/presentation/xpcom/tests/MainWindow.cpp

@@ -264 +264 @@
 
 void MainWindow::makeCallButtonClicked() {
-        string number = _phoneNumber->text().toStdString();
+        string number = _phoneNumber->text().toUtf8();
         if (!number.empty()) {
                 _command->makeCall(number, _currentLineId);
@@ -279 +279 @@
 
 void MainWindow::sendChatMessageButtonClicked() {
-        string message = _chatMessage->text().toStdString();
-        string number = _phoneNumber->text().toStdString();
+        string message = _chatMessage->text().toUtf8();
+        string number = _phoneNumber->text().toUtf8();
         if (!number.empty()) {
                 _command->sendChatMessage(number, message);
@@ -292 +292 @@
         QString configDir;
 
-        _command = new Command(configDir.toStdString());
+        _command = new Command(configDir.toUtf8());
         _command->start();
         _command->addListener(listener);