-Remove usage of latin1() as a possible fix to #1471

2 files changed, 17 insertions, 7 deletions

diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index 706d970..44d3764 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -321,73 +321,78 @@ void Checkbook::loadCheckbook()
         }
     }
     if( i<=0 ) {
         typeList->insertItem( temptext, 0 );
         typeList->setCurrentItem(0);
     }
     bankEdit->setText( info->bank() );
     acctNumEdit->setText( info->account() );
     pinNumEdit->setText( info->pin() );
     temptext.setNum( info->startingBalance(), 'f', 2 );
     balanceEdit->setText( temptext );
     notesEdit->setText( info->notes() );
 
     // Load transactions
     float amount;
     QString stramount;
+    QString symbol = _pCfg->getCurrencySymbol();
     for ( TranInfo *tran = tranList->first(); tran; tran = tranList->next() )
     {
         amount = tran->amount();
         if ( tran->withdrawal() )
         {
             amount *= -1;
         }
-        stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount );
+        stramount.sprintf( "%.2f", amount );
+        stramount.prepend( symbol );
         ( void ) new CBListItem( tran, tranTable, tran->getIdStr(), tran->datestr(false), tran->number(), tran->datestr(true), tran->desc(), stramount );
     }
 
     // set sort order
     bool bOk=false;
     for(int i=0; i<_cbSortType->count(); i++) {
         if( _cbSortType->text(i)==info->getSortOrder() ) {
             _cbSortType->setCurrentItem(i);
             slotSortChanged( info->getSortOrder() );
             bOk=true;
             break;
         }
     }
     if( !bOk ) {
         _cbSortType->setCurrentItem(0);
         slotSortChanged( _cbSortType->currentText() );
     }
 
     // calc running balance
     adjustBalance();
 }
 
 
 // --- adjustBalance ----------------------------------------------------------
 void Checkbook::adjustBalance()
 {
     // update running balance in register
     QString sRunning;
+    QString symbol = _pCfg->getCurrencySymbol();
     float bal=info->startingBalance();
+    
     for(CBListItem *item=(CBListItem *)tranTable->firstChild(); item; item=(CBListItem *)item->nextSibling() ) {
         TranInfo *tran=item->getTranInfo();
         bal=bal + (tran->withdrawal() ? -1 : 1)*tran->amount() - tran->fee();
-        sRunning.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), bal );
+        sRunning.sprintf( "%.2f", bal );
+        sRunning.prepend(symbol);
         item->setText( COL_BAL, sRunning);
     }
 }
 
 // --- resort -----------------------------------------------------------------
 void Checkbook::resort()
 {
     tranTable->setSorting(_sortCol);
     tranTable->sort();
     tranTable->setSorting(-1);
 }
 
 
 // --- accept -----------------------------------------------------------------
 void Checkbook::accept()
 {
@@ -469,42 +474,44 @@ void Checkbook::slotStartingBalanceChanged( const QString &newbalance )
     bool ok;
     info->setStartingBalance( newbalance.toFloat( &ok ) );
     adjustBalance();
 }
 
 
 // --- slotNewTran ------------------------------------------------------------
 void Checkbook::slotNewTran()
 {
     TranInfo *traninfo = new TranInfo( info->getNextNumber() );
     if( !_dLastNew.isNull() )
         traninfo->setDate(_dLastNew);
 
     Transaction *currtran = new Transaction( this, true, info->name(),
                                              traninfo,
                                              _pCfg );
+    QString symbol = _pCfg->getCurrencySymbol();
     if ( QPEApplication::execDialog( currtran ) == QDialog::Accepted )
     {
         // Add to transaction list
         info->addTransaction( traninfo );
 
         // Add to transaction table
         float amount;
         QString stramount;
-        amount = (traninfo->withdrawal() ? -1 : 1)*traninfo->amount();
-        stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount );
+                amount = (traninfo->withdrawal() ? -1 : 1)*traninfo->amount();
+        stramount.sprintf( "%.2f", amount );
+        stramount.prepend(symbol);
         ( void ) new CBListItem( traninfo, tranTable, traninfo->getIdStr(), traninfo->datestr(false),
                                  traninfo->number(), traninfo->datestr(true), traninfo->desc(),
                                  stramount );
         resort();
         adjustBalance();
 
         // save last date
         _dLastNew = traninfo->date();
 
         // save description in list of payees, if not in there
         QStringList *pLst=&_pCfg->getPayees();
         if( _pCfg->getSavePayees() && pLst->contains(traninfo->desc())==0 ) {
             pLst->append( traninfo->desc() );
             pLst->sort();
             _pCfg->setDirty(true);
         }
@@ -528,33 +535,34 @@ void Checkbook::slotEditTran()
     Transaction *currtran = new Transaction( this, false, info->name(),
                                              traninfo,
                                              _pCfg );
     if ( QPEApplication::execDialog( currtran ) == QDialog::Accepted )
     {
         curritem->setText( COL_NUM, traninfo->number() );
         curritem->setText( COL_SORTDATE, traninfo->datestr(false) );
         curritem->setText( COL_DATE, traninfo->datestr(true) );
         curritem->setText( COL_DESC, traninfo->desc() );
 
         float amount = traninfo->amount();
         if ( traninfo->withdrawal() )
         {
             amount *= -1;
         }
         QString stramount;
-        stramount.sprintf( "%s%.2f", _pCfg->getCurrencySymbol().latin1(), amount );
+        stramount.sprintf( "%.2f", amount );
+        stramount.prepend( _pCfg->getCurrencySymbol() );
         curritem->setText( COL_AMOUNT, stramount );
         resort();
         adjustBalance();
 
         // save description in list of payees, if not in there
         QStringList *pLst=&_pCfg->getPayees();
         if( _pCfg->getSavePayees() && pLst->contains(traninfo->desc())==0 ) {
             pLst->append( traninfo->desc() );
             pLst->sort();
             _pCfg->setDirty(true);
         }
     }
 
     delete currtran;
 }
 
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index ce15e3e..c7ffa7c 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -180,33 +180,34 @@ void MainWindow::buildList()
     {
         addCheckbook( cb );
     }
 }
 
 void MainWindow::addCheckbook( CBInfo *cb )
 {
     QListViewItem *lvi = new QListViewItem( cbList );
     if ( _cfg.getShowLocks() && !cb->password().isNull() )
     {
         lvi->setPixmap( 0, lockIcon );
     }
     lvi->setText( posName, cb->name() );
     if ( _cfg.getShowBalances() )
     {
         QString balance;
-        balance.sprintf( "%s%.2f", _cfg.getCurrencySymbol().latin1(), cb->balance() );
+        balance.sprintf( "%.2f", cb->balance() );
+        balance.prepend( _cfg.getCurrencySymbol() );
         lvi->setText( posName + 1, balance );
     }
 }
 
 void MainWindow::buildFilename( const QString &name )
 {
     tempFilename = cbDir;
     tempFilename.append( name );
     tempFilename.append( ".qcb" );
 }
 
 void MainWindow::slotNew()
 {
     CBInfo *cb = new CBInfo();
 
     Checkbook *currcb = new Checkbook( this, cb, &_cfg );
@@ -291,33 +292,34 @@ void MainWindow::openBook(QListViewItem *curritem)
 
         cb->write();
 
         // Update lock if changed
         if ( _cfg.getShowLocks() && !cb->password().isNull() != currlock )
         {
             if ( !cb->password().isNull() )
                 curritem->setPixmap( 0, lockIcon );
             else
                 curritem->setPixmap( 0, nullIcon );
         }
 
         // Update balance if changed
         if ( _cfg.getShowBalances() && cb->balance() != currbalance )
         {
             QString tempstr;
-            tempstr.sprintf( "%s%.2f", _cfg.getCurrencySymbol().latin1(), cb->balance() );
+            tempstr.sprintf( "%.2f", cb->balance() );
+            tempstr.prepend( _cfg.getCurrencySymbol() );
             curritem->setText( posName + 1, tempstr );
         }
 
         // write config, if needed
         if( _cfg.isDirty() ) {
             Config config("checkbook");
             _cfg.writeConfig( config );
         }
     }
     delete currcb;
 }
 
 // --- slotDelete -------------------------------------------------------------
 void MainWindow::slotDelete()
 {
     QString currname = cbList->currentItem()->text( posName );