[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/libarchive-based-ark/ark/kerfuffle
From:       Henrique Pinto <tawhaki () gmail ! com>
Date:       2007-07-14 15:25:42
Message-ID: 1184426742.605958.8856.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 687866 by henrique:

 * Remove some debug messages
 * Emit the error signal


 M  +4 -0      jobs.cpp  
 M  +2 -0      jobs.h  
 M  +0 -3      libarchivehandler.cpp  


--- branches/work/libarchive-based-ark/ark/kerfuffle/jobs.cpp #687865:687866
@@ -45,6 +45,8 @@
 	         this, SIGNAL( entry( const ArchiveEntry & ) ) );
 	connect( m_helper, SIGNAL( progress( double ) ),
 	         this, SIGNAL( progress( double ) ) );
+	connect( m_helper, SIGNAL( error( const QString&, const QString& ) ),
+	         this, SIGNAL( error( const QString&, const QString& ) ) );
 	m_success = m_helper->getTheListing();
 }
 
@@ -66,6 +68,8 @@
 	m_helper = new ArchiveJobHelper( m_archive );
 	connect( m_helper, SIGNAL( progress( double ) ),
 	         this, SIGNAL( progress( double ) ) );
+	connect( m_helper, SIGNAL( error( const QString&, const QString& ) ),
+	         this, SIGNAL( error( const QString&, const QString& ) ) );
 	m_archive->registerObserver( m_helper );
 	m_success = m_archive->copyFiles( m_files, m_destinationDirectory );
 	m_archive->removeObserver( m_helper );
--- branches/work/libarchive-based-ark/ark/kerfuffle/jobs.h #687865:687866
@@ -49,6 +49,7 @@
 		void entry( const ArchiveEntry & );
 		//void entries( const QList<ArchiveEntry & );
 		void progress( double );
+		void error( const QString& errorMessage, const QString& details );
 
 	private:
 		QList<ArchiveEntry>       m_entries;
@@ -71,6 +72,7 @@
 
 	signals:
 		void progress( double p );
+		void error( const QString& errorMessage, const QString& details );
 
 	private:
 		ReadOnlyArchiveInterface *m_archive;
--- branches/work/libarchive-based-ark/ark/kerfuffle/libarchivehandler.cpp #687865:687866
@@ -80,7 +80,6 @@
 		e[ OriginalFileName ] = QByteArray( archive_entry_pathname( aentry ) );
 		e[ Owner ] = QString( archive_entry_uname( aentry ) );
 		e[ Group ] = QString( archive_entry_gname( aentry ) );
-		kDebug( 1601 ) << "Entry: " << e[ FileName ] << ", Owner = " << e[ Owner ] << endl;
 		e[ Size ] = ( qlonglong ) archive_entry_size( aentry );
 		if ( archive_entry_symlink( aentry ) )
 		{
@@ -144,7 +143,6 @@
 		}
 		else
 		{
-			kDebug( 1601 ) << entryName << " matches no requested file. " << endl;
 			archive_read_data_skip( arch );
 		}
 	}
@@ -178,7 +176,6 @@
 
 	while ( archive_read_data_block( source, &buff, &size, &offset ) == ARCHIVE_OK )
 	{
-		kDebug( 1601 )  << "	copyData: copying " << size << " from offset " << offset << endl;
 		archive_write_data_block( dest, buff, size, offset );
 	}
 }
[prev in list] [next in list] [prev in thread] [next in thread]