summaryrefslogtreecommitdiff
authorzecke <zecke>2002-11-07 19:36:16 (UTC)
committer zecke <zecke>2002-11-07 19:36:16 (UTC)
commit034f0fffc51bb985884a2184c24514415549f88b (patch) (unidiff)
treef4ac08d2b1ad87fa871926196fd6804f2022d305
parentdff60fb41a3a4ae7ef1e479702ddcc87213b9755 (diff)
downloadopie-034f0fffc51bb985884a2184c24514415549f88b.zip
opie-034f0fffc51bb985884a2184c24514415549f88b.tar.gz
opie-034f0fffc51bb985884a2184c24514415549f88b.tar.bz2
Removed default argument!
spotted by gcc3.2 reported by the ueberhacker tronical ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/oticker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp
index 3fcef5d..47dcb3e 100644
--- a/libopie/oticker.cpp
+++ b/libopie/oticker.cpp
@@ -1,110 +1,110 @@
1/* 1/*
2                This file is part of the Opie Project 2                This file is part of the Opie Project
3 Copyright (c) 2002 L. Potter <ljp@llornkcor.com> 3 Copyright (c) 2002 L. Potter <ljp@llornkcor.com>
4 =. 4 =.
5 .=l. 5 .=l.
6           .>+-= 6           .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7 _;:,     .>    :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_,   >  .   <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU General Public 9:`=1 )Y*s>-.--   : the terms of the GNU General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i,     .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11 - .   .-<_>     .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14    .i_,=:_.      -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.=       =       ; Library General Public License for more
20++=   -.     .`     .: details. 20++=   -.     .`     .: details.
21 :     =  ...= . :.=- 21 :     =  ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22 -.   .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23  -_. . .   )=.  = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24    --        :-=` this library; see the file COPYING.LIB.
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28 28
29*/ 29*/
30 30
31#include <qpe/qpeapplication.h> 31#include <qpe/qpeapplication.h>
32#include <qpe/resource.h> 32#include <qpe/resource.h>
33#include <qpe/config.h> 33#include <qpe/config.h>
34 34
35#include <qwidget.h> 35#include <qwidget.h>
36#include <qpixmap.h> 36#include <qpixmap.h>
37#include <qbutton.h> 37#include <qbutton.h>
38#include <qpainter.h> 38#include <qpainter.h>
39#include <qframe.h> 39#include <qframe.h>
40#include <qlayout.h> 40#include <qlayout.h>
41#include <qdir.h> 41#include <qdir.h>
42#include <stdlib.h> 42#include <stdlib.h>
43#include <stdio.h> 43#include <stdio.h>
44 44
45#include "oticker.h" 45#include "oticker.h"
46 46
47OTicker::OTicker( QWidget* parent=0 ) 47OTicker::OTicker( QWidget* parent )
48 : QFrame( parent ) { 48 : QFrame( parent ) {
49 49
50// setFrameStyle( NoFrame/*WinPanel | Sunken */); 50// setFrameStyle( NoFrame/*WinPanel | Sunken */);
51 51
52 Config cfg("qpe"); 52 Config cfg("qpe");
53 cfg.setGroup("Appearance"); 53 cfg.setGroup("Appearance");
54 backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) ); 54 backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) );
55 foregroundcolor= Qt::black; 55 foregroundcolor= Qt::black;
56} 56}
57 57
58OTicker::~OTicker() { 58OTicker::~OTicker() {
59} 59}
60 60
61void OTicker::setBackgroundColor(QColor backcolor) { 61void OTicker::setBackgroundColor(QColor backcolor) {
62 backgroundcolor = backcolor; 62 backgroundcolor = backcolor;
63} 63}
64 64
65void OTicker::setForegroundColor(QColor backcolor) { 65void OTicker::setForegroundColor(QColor backcolor) {
66 foregroundcolor = backcolor; 66 foregroundcolor = backcolor;
67} 67}
68 68
69void OTicker::setFrame(int frameStyle) { 69void OTicker::setFrame(int frameStyle) {
70 setFrameStyle( frameStyle/*WinPanel | Sunken */); 70 setFrameStyle( frameStyle/*WinPanel | Sunken */);
71} 71}
72 72
73void OTicker::setText( const QString& text ) { 73void OTicker::setText( const QString& text ) {
74 pos = 0; // reset it everytime the text is changed 74 pos = 0; // reset it everytime the text is changed
75 scrollText = text; 75 scrollText = text;
76 76
77 int pixelLen = fontMetrics().width( text ); 77 int pixelLen = fontMetrics().width( text );
78 QPixmap pm( pixelLen, contentsRect().height() ); 78 QPixmap pm( pixelLen, contentsRect().height() );
79// pm.fill( QColor( 167, 212, 167 )); 79// pm.fill( QColor( 167, 212, 167 ));
80 80
81 pm.fill(backgroundcolor); 81 pm.fill(backgroundcolor);
82 QPainter pmp( &pm ); 82 QPainter pmp( &pm );
83 pmp.setPen(foregroundcolor ); 83 pmp.setPen(foregroundcolor );
84 pmp.drawText( 0, 0, pixelLen, contentsRect().height(), AlignVCenter, scrollText ); 84 pmp.drawText( 0, 0, pixelLen, contentsRect().height(), AlignVCenter, scrollText );
85 pmp.end(); 85 pmp.end();
86 scrollTextPixmap = pm; 86 scrollTextPixmap = pm;
87 87
88 killTimers(); 88 killTimers();
89 if ( pixelLen > contentsRect().width() ) 89 if ( pixelLen > contentsRect().width() )
90 startTimer( 50 ); 90 startTimer( 50 );
91 update(); 91 update();
92} 92}
93 93
94 94
95void OTicker::timerEvent( QTimerEvent * ) { 95void OTicker::timerEvent( QTimerEvent * ) {
96 pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - 1; 96 pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - 1;
97 repaint( FALSE ); 97 repaint( FALSE );
98} 98}
99 99
100void OTicker::drawContents( QPainter *p ) { 100void OTicker::drawContents( QPainter *p ) {
101 int pixelLen = scrollTextPixmap.width(); 101 int pixelLen = scrollTextPixmap.width();
102 p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap ); 102 p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap );
103 if ( pixelLen > contentsRect().width() ) // Scrolling 103 if ( pixelLen > contentsRect().width() ) // Scrolling
104 p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap ); 104 p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap );
105} 105}
106 106
107void OTicker::mouseReleaseEvent( QMouseEvent * ) { 107void OTicker::mouseReleaseEvent( QMouseEvent * ) {
108// qDebug("<<<<<<<>>>>>>>>>"); 108// qDebug("<<<<<<<>>>>>>>>>");
109 emit mousePressed(); 109 emit mousePressed();
110} 110}