← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/PylogFormatter.h

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/PylogFormatter.h
1
1
#ifndef PYLOG_FORMATTER_H_SEEN
2
2
#define PYLOG_FORMATTER_H_SEEN
3
3
 
 
4
#include <cstring>
4
5
#include <cxxtest/Flags.h>
5
6
 
6
7
#ifndef _CXXTEST_HAVE_STD
30
31
    {}
31
32
    virtual ~PylogFormatter() { delete outputStream(); }
32
33
 
33
 
    virtual void enterWorld( const WorldDescription & desc )
 
34
    virtual void enterWorld( const WorldDescription & /*desc*/ )
34
35
    {
35
36
        (*_o) << "**************************************************" << endl;
36
37
        _o->flush();
38
39
 
39
40
    virtual void leaveWorld( const WorldDescription & desc )
40
41
    {
 
42
        using std::strlen;
41
43
        unsigned int skippedCount = 0;
42
44
        unsigned int failedCount = 0;
43
45
        unsigned int warnedCount = 0;
59
61
                (*_o) << test.suiteName() << "_|_" << test.testName();
60
62
                (*_o) << " ";
61
63
 
62
 
                int sent = strlen( test.suiteName() ) + strlen( test.testName() ) + 1;
63
 
                for ( int z = sent; z < 56; z++ ) {
 
64
                unsigned const sent = strlen( test.suiteName() ) + strlen( test.testName() ) + 1;
 
65
                for ( unsigned z = sent; z < 56; z++ ) {
64
66
                    (*_o) << " ";
65
67
                }
66
68
 
296
298
        return _o;
297
299
    }
298
300
 
299
 
    void _traceCurrent( const char* file, unsigned line, const CXXTEST_STD(string)& errMsg ) {
 
301
    void _traceCurrent( const char* /*file*/, unsigned /*line*/, const CXXTEST_STD(string)& errMsg ) {
300
302
        _runPassed = false;
301
303
        if ( _suiteIndex < (int)_status.size() ) {
302
304
            if ( _testIndex < (int)_status[_suiteIndex].size() ) {
305
307
        }
306
308
    }
307
309
 
308
 
    void _warnCurrent( const char* file, unsigned line, const CXXTEST_STD(string)& errMsg ) {
 
310
    void _warnCurrent( const char* /*file*/, unsigned /*line*/, const CXXTEST_STD(string)& errMsg ) {
309
311
        _runPassed = false;
310
312
        if ( _suiteIndex < (int)_status.size() ) {
311
313
            if ( _testIndex < (int)_status[_suiteIndex].size() ) {
318
320
        }
319
321
    }
320
322
 
321
 
    void _failCurrent( const char* file, unsigned line, const CXXTEST_STD(string)& errMsg ) {
 
323
    void _failCurrent( const char* /*file*/, unsigned /*line*/, const CXXTEST_STD(string)& errMsg ) {
322
324
        _runPassed = false;
323
325
        if ( _suiteIndex < (int)_status.size() ) {
324
326
            if ( _testIndex < (int)_status[_suiteIndex].size() ) {