-rw-r--r-- | noncore/apps/opie-reader/Bkmks.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/CBuffer.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/CDrawBuffer.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReader.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-reader/infowin.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/noncore/apps/opie-reader/Bkmks.cpp b/noncore/apps/opie-reader/Bkmks.cpp index 0cb9ea9..30d2881 100644 --- a/noncore/apps/opie-reader/Bkmks.cpp +++ b/noncore/apps/opie-reader/Bkmks.cpp | |||
@@ -82,25 +82,25 @@ void Bkmk::setAnno(tchar* t) | |||
82 | m_anno = NULL; | 82 | m_anno = NULL; |
83 | } | 83 | } |
84 | if (t != NULL) | 84 | if (t != NULL) |
85 | { | 85 | { |
86 | int len = ustrlen(t)+1; | 86 | int len = ustrlen(t)+1; |
87 | m_anno = new tchar[len]; | 87 | m_anno = new tchar[len]; |
88 | for (int i = 0; i < len; i++) m_anno[i] = t[i]; | 88 | for (int i = 0; i < len; i++) m_anno[i] = t[i]; |
89 | } | 89 | } |
90 | else | 90 | else |
91 | m_anno = NULL; | 91 | m_anno = NULL; |
92 | } | 92 | } |
93 | 93 | ||
94 | BkmkFile::BkmkFile(const char *fnm, bool w = false) | 94 | BkmkFile::BkmkFile(const char *fnm, bool w ) |
95 | : | 95 | : |
96 | wt(w), isUpgraded(false) | 96 | wt(w), isUpgraded(false) |
97 | { | 97 | { |
98 | if (w) | 98 | if (w) |
99 | { | 99 | { |
100 | f = fopen(fnm, "wb"); | 100 | f = fopen(fnm, "wb"); |
101 | } | 101 | } |
102 | else | 102 | else |
103 | { | 103 | { |
104 | f = fopen(fnm, "rb"); | 104 | f = fopen(fnm, "rb"); |
105 | } | 105 | } |
106 | } | 106 | } |
diff --git a/noncore/apps/opie-reader/CBuffer.cpp b/noncore/apps/opie-reader/CBuffer.cpp index 526b25f..0780a88 100644 --- a/noncore/apps/opie-reader/CBuffer.cpp +++ b/noncore/apps/opie-reader/CBuffer.cpp | |||
@@ -2,45 +2,45 @@ | |||
2 | 2 | ||
3 | CBufferBase& CBufferBase::assign(const void* sztmp, size_t ms) | 3 | CBufferBase& CBufferBase::assign(const void* sztmp, size_t ms) |
4 | { | 4 | { |
5 | if (ms*membersize > len) | 5 | if (ms*membersize > len) |
6 | { | 6 | { |
7 | delete [] buffer; | 7 | delete [] buffer; |
8 | buffer = new unsigned char[len = ms*membersize]; | 8 | buffer = new unsigned char[len = ms*membersize]; |
9 | } | 9 | } |
10 | memcpy(buffer, sztmp, ms*membersize); | 10 | memcpy(buffer, sztmp, ms*membersize); |
11 | return *this; | 11 | return *this; |
12 | } | 12 | } |
13 | 13 | ||
14 | CBufferBase::CBufferBase(size_t ms, size_t n = 16) : len(n), membersize(ms) | 14 | CBufferBase::CBufferBase(size_t ms, size_t n) : len(n), membersize(ms) |
15 | { | 15 | { |
16 | buffer = new unsigned char[len*membersize]; | 16 | buffer = new unsigned char[len*membersize]; |
17 | memset(buffer, 0, len*membersize); | 17 | memset(buffer, 0, len*membersize); |
18 | } | 18 | } |
19 | 19 | ||
20 | void* CBufferBase::operator[](int i) | 20 | void* CBufferBase::operator[](int i) |
21 | { | 21 | { |
22 | if ((i+1)*membersize > len) | 22 | if ((i+1)*membersize > len) |
23 | { | 23 | { |
24 | unsigned char* oldbuffer = buffer; | 24 | unsigned char* oldbuffer = buffer; |
25 | buffer = new unsigned char[(i+1)*membersize]; | 25 | buffer = new unsigned char[(i+1)*membersize]; |
26 | memcpy(buffer, oldbuffer, len); | 26 | memcpy(buffer, oldbuffer, len); |
27 | memset(buffer+len, 0, (i+1)*membersize-len); | 27 | memset(buffer+len, 0, (i+1)*membersize-len); |
28 | len = (i+1)*membersize; | 28 | len = (i+1)*membersize; |
29 | delete [] oldbuffer; | 29 | delete [] oldbuffer; |
30 | } | 30 | } |
31 | return buffer+i*membersize; | 31 | return buffer+i*membersize; |
32 | } | 32 | } |
33 | 33 | ||
34 | size_t CBufferBase::bstrlen(unsigned char* _buffer = NULL) | 34 | size_t CBufferBase::bstrlen(unsigned char* _buffer) |
35 | { | 35 | { |
36 | if (_buffer == NULL) _buffer = buffer; | 36 | if (_buffer == NULL) _buffer = buffer; |
37 | unsigned char* zero = new unsigned char[membersize]; | 37 | unsigned char* zero = new unsigned char[membersize]; |
38 | memset(zero,0,membersize); | 38 | memset(zero,0,membersize); |
39 | unsigned char* element = _buffer; | 39 | unsigned char* element = _buffer; |
40 | while (memcmp(element, zero, membersize) != 0) | 40 | while (memcmp(element, zero, membersize) != 0) |
41 | { | 41 | { |
42 | element += membersize; | 42 | element += membersize; |
43 | } | 43 | } |
44 | delete [] zero; | 44 | delete [] zero; |
45 | return (element - _buffer)/membersize; | 45 | return (element - _buffer)/membersize; |
46 | } | 46 | } |
diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp index 2ceb2d5..892456f 100644 --- a/noncore/apps/opie-reader/CDrawBuffer.cpp +++ b/noncore/apps/opie-reader/CDrawBuffer.cpp | |||
@@ -96,25 +96,25 @@ void CDrawBuffer::addch(tchar ch, CStyle _style/* = ucFontBase*/) | |||
96 | } | 96 | } |
97 | segs.push_back(textsegment(len, _style)); | 97 | segs.push_back(textsegment(len, _style)); |
98 | } | 98 | } |
99 | (*this)[len++] = ch; | 99 | (*this)[len++] = ch; |
100 | } | 100 | } |
101 | 101 | ||
102 | void CDrawBuffer::truncate(int n) | 102 | void CDrawBuffer::truncate(int n) |
103 | { | 103 | { |
104 | len = n; | 104 | len = n; |
105 | (*this)[n] = 0; | 105 | (*this)[n] = 0; |
106 | } | 106 | } |
107 | 107 | ||
108 | int CDrawBuffer::width(int numchars = -1) | 108 | int CDrawBuffer::width(int numchars) |
109 | { | 109 | { |
110 | int currentx = 0, end = 0; | 110 | int currentx = 0, end = 0; |
111 | QString text = toQString(data()); | 111 | QString text = toQString(data()); |
112 | CList<textsegment>::iterator textstart = segs.begin(); | 112 | CList<textsegment>::iterator textstart = segs.begin(); |
113 | CList<textsegment>::iterator textend = textstart; | 113 | CList<textsegment>::iterator textend = textstart; |
114 | do | 114 | do |
115 | { | 115 | { |
116 | textend++; | 116 | textend++; |
117 | end = (textend != segs.end()) ? textend->start : length(); | 117 | end = (textend != segs.end()) ? textend->start : length(); |
118 | if (numchars >= 0 && end > numchars) | 118 | if (numchars >= 0 && end > numchars) |
119 | { | 119 | { |
120 | end = numchars; | 120 | end = numchars; |
diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp index e7bfc28..7cf08e5 100644 --- a/noncore/apps/opie-reader/QTReader.cpp +++ b/noncore/apps/opie-reader/QTReader.cpp | |||
@@ -26,25 +26,25 @@ | |||
26 | #ifdef _UNICODE | 26 | #ifdef _UNICODE |
27 | const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 }; | 27 | const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 }; |
28 | #else | 28 | #else |
29 | const char *QTReader::fonts[] = { "Helvetica", "Courier", "Times", 0 }; | 29 | const char *QTReader::fonts[] = { "Helvetica", "Courier", "Times", 0 }; |
30 | #endif | 30 | #endif |
31 | //const int QTReader::fontsizes[] = { 8, 10, 12, 14, 18, 24, 30, 40, 50, 60, 70, 80, 90, 100, 0 }; | 31 | //const int QTReader::fontsizes[] = { 8, 10, 12, 14, 18, 24, 30, 40, 50, 60, 70, 80, 90, 100, 0 }; |
32 | 32 | ||
33 | //const tchar *QTReader::fonts[] = { "unifont", "fixed", "micro", "smoothtimes", "Courier", "Times", 0 }; | 33 | //const tchar *QTReader::fonts[] = { "unifont", "fixed", "micro", "smoothtimes", "Courier", "Times", 0 }; |
34 | //const int QTReader::fontsizes[] = {10,16,17,22,0}; | 34 | //const int QTReader::fontsizes[] = {10,16,17,22,0}; |
35 | //const tchar *QTReader::fonts[] = { "verdana", "Courier", "Times", 0 }; | 35 | //const tchar *QTReader::fonts[] = { "verdana", "Courier", "Times", 0 }; |
36 | //const int QTReader::fontsizes[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,0}; | 36 | //const int QTReader::fontsizes[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,0}; |
37 | 37 | ||
38 | QTReader::QTReader( QWidget *parent=0, const char *name=0, WFlags f = 0) : | 38 | QTReader::QTReader( QWidget *parent, const char *name, WFlags f) : |
39 | QWidget(parent, name, f), | 39 | QWidget(parent, name, f), |
40 | m_delay(100), | 40 | m_delay(100), |
41 | m_scrolldy1(0), | 41 | m_scrolldy1(0), |
42 | m_scrolldy2(0), | 42 | m_scrolldy2(0), |
43 | m_autoScroll(false), | 43 | m_autoScroll(false), |
44 | //textarray(NULL), | 44 | //textarray(NULL), |
45 | //locnarray(NULL), | 45 | //locnarray(NULL), |
46 | numlines(0), | 46 | numlines(0), |
47 | m_fontname("unifont"), | 47 | m_fontname("unifont"), |
48 | m_fm(NULL), | 48 | m_fm(NULL), |
49 | mouseUpOn(true), | 49 | mouseUpOn(true), |
50 | m_twotouch(true), | 50 | m_twotouch(true), |
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index ef1f4f1..8726df7 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -1700,25 +1700,25 @@ void QTReaderApp::setfont() | |||
1700 | for (int i = 1; i <= m_fontSelector->count(); i++) | 1700 | for (int i = 1; i <= m_fontSelector->count(); i++) |
1701 | { | 1701 | { |
1702 | if (m_fontSelector->text(i) == reader->m_fontname) | 1702 | if (m_fontSelector->text(i) == reader->m_fontname) |
1703 | { | 1703 | { |
1704 | m_fontSelector->setCurrentItem(i); | 1704 | m_fontSelector->setCurrentItem(i); |
1705 | break; | 1705 | break; |
1706 | } | 1706 | } |
1707 | } | 1707 | } |
1708 | m_fontBar->show(); | 1708 | m_fontBar->show(); |
1709 | m_fontVisible = true; | 1709 | m_fontVisible = true; |
1710 | } | 1710 | } |
1711 | 1711 | ||
1712 | void QTReaderApp::setfontHelper(const QString& lcn, int size = 0) | 1712 | void QTReaderApp::setfontHelper(const QString& lcn, int size) |
1713 | { | 1713 | { |
1714 | if (size == 0) size = reader->m_fontControl.currentsize(); | 1714 | if (size == 0) size = reader->m_fontControl.currentsize(); |
1715 | QFont f(lcn, 10 /*, QFont::Bold*/); | 1715 | QFont f(lcn, 10 /*, QFont::Bold*/); |
1716 | bkmkselector->setFont( f ); | 1716 | bkmkselector->setFont( f ); |
1717 | regEdit->setFont( f ); | 1717 | regEdit->setFont( f ); |
1718 | searchEdit->setFont( f ); | 1718 | searchEdit->setFont( f ); |
1719 | m_annoWin->setFont( f ); | 1719 | m_annoWin->setFont( f ); |
1720 | reader->m_fontname = lcn; | 1720 | reader->m_fontname = lcn; |
1721 | if (!reader->ChangeFont(size)) | 1721 | if (!reader->ChangeFont(size)) |
1722 | { | 1722 | { |
1723 | reader->ChangeFont(size); | 1723 | reader->ChangeFont(size); |
1724 | } | 1724 | } |
diff --git a/noncore/apps/opie-reader/infowin.cpp b/noncore/apps/opie-reader/infowin.cpp index 9637a62..7b8f280 100644 --- a/noncore/apps/opie-reader/infowin.cpp +++ b/noncore/apps/opie-reader/infowin.cpp | |||
@@ -1,17 +1,17 @@ | |||
1 | #include "infowin.h" | 1 | #include "infowin.h" |
2 | #include "version.h" | 2 | #include "version.h" |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | 4 | ||
5 | infowin::infowin( QWidget *parent=0, const char *name=0, WFlags f = 0) : | 5 | infowin::infowin( QWidget *parent, const char *name, WFlags f) : |
6 | QWidget(parent, name, f) | 6 | QWidget(parent, name, f) |
7 | { | 7 | { |
8 | grid = new QGridLayout(this, 6, 2); | 8 | grid = new QGridLayout(this, 6, 2); |
9 | QLabel* l; | 9 | QLabel* l; |
10 | l = new QLabel("Compressed file size", this); | 10 | l = new QLabel("Compressed file size", this); |
11 | grid->addWidget(l, 0, 0); | 11 | grid->addWidget(l, 0, 0); |
12 | fileSize = new QLabel("0", this); | 12 | fileSize = new QLabel("0", this); |
13 | fileSize->setAlignment( AlignVCenter | AlignRight ); | 13 | fileSize->setAlignment( AlignVCenter | AlignRight ); |
14 | grid->addWidget(fileSize, 0, 1); | 14 | grid->addWidget(fileSize, 0, 1); |
15 | l = new QLabel("Original text size", this); | 15 | l = new QLabel("Original text size", this); |
16 | grid->addWidget(l, 1, 0); | 16 | grid->addWidget(l, 1, 0); |
17 | textSize = new QLabel("0", this); | 17 | textSize = new QLabel("0", this); |