author | zecke <zecke> | 2002-11-03 11:11:00 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-11-03 11:11:00 (UTC) |
commit | d26f82ea57c70fd0e77eb192f7e133c5f76c2f0f (patch) (side-by-side diff) | |
tree | 16240b40b1be5b581dc2fb7e1a0c18239c3dc4fd | |
parent | eac6c5d3a22147d78866122c2f5b89d3fdf6bfc6 (diff) | |
download | opie-d26f82ea57c70fd0e77eb192f7e133c5f76c2f0f.zip opie-d26f82ea57c70fd0e77eb192f7e133c5f76c2f0f.tar.gz opie-d26f82ea57c70fd0e77eb192f7e133c5f76c2f0f.tar.bz2 |
Gcc3 compiler fixes again
No default arguments in the implementation please
-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) m_anno = NULL; } if (t != NULL) { int len = ustrlen(t)+1; m_anno = new tchar[len]; for (int i = 0; i < len; i++) m_anno[i] = t[i]; } else m_anno = NULL; } -BkmkFile::BkmkFile(const char *fnm, bool w = false) +BkmkFile::BkmkFile(const char *fnm, bool w ) : wt(w), isUpgraded(false) { if (w) { f = fopen(fnm, "wb"); } else { f = fopen(fnm, "rb"); } } 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 @@ CBufferBase& CBufferBase::assign(const void* sztmp, size_t ms) { if (ms*membersize > len) { delete [] buffer; buffer = new unsigned char[len = ms*membersize]; } memcpy(buffer, sztmp, ms*membersize); return *this; } -CBufferBase::CBufferBase(size_t ms, size_t n = 16) : len(n), membersize(ms) +CBufferBase::CBufferBase(size_t ms, size_t n) : len(n), membersize(ms) { buffer = new unsigned char[len*membersize]; memset(buffer, 0, len*membersize); } void* CBufferBase::operator[](int i) { if ((i+1)*membersize > len) { unsigned char* oldbuffer = buffer; buffer = new unsigned char[(i+1)*membersize]; memcpy(buffer, oldbuffer, len); memset(buffer+len, 0, (i+1)*membersize-len); len = (i+1)*membersize; delete [] oldbuffer; } return buffer+i*membersize; } -size_t CBufferBase::bstrlen(unsigned char* _buffer = NULL) +size_t CBufferBase::bstrlen(unsigned char* _buffer) { if (_buffer == NULL) _buffer = buffer; unsigned char* zero = new unsigned char[membersize]; memset(zero,0,membersize); unsigned char* element = _buffer; while (memcmp(element, zero, membersize) != 0) { element += membersize; } delete [] zero; return (element - _buffer)/membersize; } 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*/) } segs.push_back(textsegment(len, _style)); } (*this)[len++] = ch; } void CDrawBuffer::truncate(int n) { len = n; (*this)[n] = 0; } -int CDrawBuffer::width(int numchars = -1) +int CDrawBuffer::width(int numchars) { int currentx = 0, end = 0; QString text = toQString(data()); CList<textsegment>::iterator textstart = segs.begin(); CList<textsegment>::iterator textend = textstart; do { textend++; end = (textend != segs.end()) ? textend->start : length(); if (numchars >= 0 && end > numchars) { 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 @@ #ifdef _UNICODE const char *QTReader::fonts[] = { "unifont", "Courier", "Times", 0 }; #else const char *QTReader::fonts[] = { "Helvetica", "Courier", "Times", 0 }; #endif //const int QTReader::fontsizes[] = { 8, 10, 12, 14, 18, 24, 30, 40, 50, 60, 70, 80, 90, 100, 0 }; //const tchar *QTReader::fonts[] = { "unifont", "fixed", "micro", "smoothtimes", "Courier", "Times", 0 }; //const int QTReader::fontsizes[] = {10,16,17,22,0}; //const tchar *QTReader::fonts[] = { "verdana", "Courier", "Times", 0 }; //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}; -QTReader::QTReader( QWidget *parent=0, const char *name=0, WFlags f = 0) : +QTReader::QTReader( QWidget *parent, const char *name, WFlags f) : QWidget(parent, name, f), m_delay(100), m_scrolldy1(0), m_scrolldy2(0), m_autoScroll(false), //textarray(NULL), //locnarray(NULL), numlines(0), m_fontname("unifont"), m_fm(NULL), mouseUpOn(true), 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() for (int i = 1; i <= m_fontSelector->count(); i++) { if (m_fontSelector->text(i) == reader->m_fontname) { m_fontSelector->setCurrentItem(i); break; } } m_fontBar->show(); m_fontVisible = true; } -void QTReaderApp::setfontHelper(const QString& lcn, int size = 0) +void QTReaderApp::setfontHelper(const QString& lcn, int size) { if (size == 0) size = reader->m_fontControl.currentsize(); QFont f(lcn, 10 /*, QFont::Bold*/); bkmkselector->setFont( f ); regEdit->setFont( f ); searchEdit->setFont( f ); m_annoWin->setFont( f ); reader->m_fontname = lcn; if (!reader->ChangeFont(size)) { reader->ChangeFont(size); } 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 @@ #include "infowin.h" #include "version.h" #include <stdio.h> -infowin::infowin( QWidget *parent=0, const char *name=0, WFlags f = 0) : +infowin::infowin( QWidget *parent, const char *name, WFlags f) : QWidget(parent, name, f) { grid = new QGridLayout(this, 6, 2); QLabel* l; l = new QLabel("Compressed file size", this); grid->addWidget(l, 0, 0); fileSize = new QLabel("0", this); fileSize->setAlignment( AlignVCenter | AlignRight ); grid->addWidget(fileSize, 0, 1); l = new QLabel("Original text size", this); grid->addWidget(l, 1, 0); textSize = new QLabel("0", this); |