View | Details | Raw Unified | Return to bug 13420
Collapse All | Expand All

(-)ark/sevenzip.cpp.orig (-5 / +9 lines)
Lines 232-238 void SevenZipArch::unarchFileInternal( ) Link Here
232
  if ( !m_password.isEmpty() )
232
  if ( !m_password.isEmpty() )
233
    *kp << "-p" + m_password;
233
    *kp << "-p" + m_password;
234
234
235
  *kp << m_filename;
235
  QTextCodec *codec = QTextCodec::codecForLocale();
236
237
  *kp << codec->fromUnicode(m_filename);
236
238
237
  // if the file list is empty, no filenames go on the command line,
239
  // if the file list is empty, no filenames go on the command line,
238
  // and we then extract everything in the archive.
240
  // and we then extract everything in the archive.
Lines 241-251 void SevenZipArch::unarchFileInternal( ) Link Here
241
    QStringList::Iterator it;
243
    QStringList::Iterator it;
242
    for ( it = m_fileList->begin(); it != m_fileList->end(); ++it )
244
    for ( it = m_fileList->begin(); it != m_fileList->end(); ++it )
243
    {
245
    {
244
      *kp << (*it);
246
      *kp << codec->fromUnicode(*it);
245
    }
247
    }
246
  }
248
  }
247
249
248
  *kp << "-o" + m_destDir ;
250
  *kp << "-o" + codec->fromUnicode(m_destDir) ;
249
251
250
  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
252
  connect( kp, SIGNAL( receivedStdout(KProcess*, char*, int) ),
251
           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
253
           SLOT( slotReceivedOutput(KProcess*, char*, int) ) );
Lines 263-273 void SevenZipArch::unarchFileInternal( ) Link Here
263
265
264
bool SevenZipArch::processLine( const QCString& _line )
266
bool SevenZipArch::processLine( const QCString& _line )
265
{
267
{
266
  QCString line( _line );
268
  QString line;
267
  QString columns[ 11 ];
269
  QString columns[ 11 ];
268
  unsigned int pos = 0;
270
  unsigned int pos = 0;
269
  int strpos, len;
271
  int strpos, len;
270
272
  QTextCodec *codec = QTextCodec::codecForLocale();
273
  line = codec->toUnicode( _line );
274
	  
271
  columns[ 0 ] = line.right( line.length() - m_nameColumnPos);
275
  columns[ 0 ] = line.right( line.length() - m_nameColumnPos);
272
  line.truncate( m_nameColumnPos );
276
  line.truncate( m_nameColumnPos );
273
277

Return to bug 13420