← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/koffice/oneiric-updates

« back to all changes in this revision

Viewing changes to libs/odf/KoStoreDevice.h

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/odf/KoStoreDevice.h
58
58
            return 0xffffffff;
59
59
    }
60
60
 
61
 
#if 0
62
 
    int getch() {
63
 
        char c[2];
64
 
        if (m_store->read(c, 1) == -1)
65
 
            return -1;
66
 
        else
67
 
            return c[0];
68
 
    }
69
 
    int putch(int _c) {
70
 
        char c[2];
71
 
        c[0] = _c;
72
 
        c[1] = 0;
73
 
        if (m_store->write(c, 1) == 1)
74
 
            return _c;
75
 
        else
76
 
            return -1;
77
 
    }
78
 
    int ungetch(int) {
79
 
        return -1;
80
 
    } // unsupported
81
 
#endif
82
 
 
83
61
    // See QIODevice
84
62
    virtual qint64 pos() const {
85
63
        return m_store->pos();
92
70
    }
93
71
 
94
72
protected:
95
 
    KoStore * m_store;
 
73
    KoStore *m_store;
96
74
 
97
75
    virtual qint64 readData(char *data, qint64 maxlen) {
98
76
        return m_store->read(data, maxlen);