author | zecke <zecke> | 2003-06-11 10:24:16 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-06-11 10:24:16 (UTC) |
commit | 188319af82322c84f02e1abb848d908ca8f9e26c (patch) (side-by-side diff) | |
tree | e88f078a70ded124b1cf0adc2b2a039f564e861b | |
parent | 4d05b57498f6b2f135ecd55e5fde5e6ebc21c160 (diff) | |
download | opie-188319af82322c84f02e1abb848d908ca8f9e26c.zip opie-188319af82322c84f02e1abb848d908ca8f9e26c.tar.gz opie-188319af82322c84f02e1abb848d908ca8f9e26c.tar.bz2 |
do what the FIXME says... const fixes
-rw-r--r-- | libopie/oticker.cpp | 4 | ||||
-rw-r--r-- | libopie/oticker.h | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp index 9a7044d..4fb5945 100644 --- a/libopie/oticker.cpp +++ b/libopie/oticker.cpp @@ -14,102 +14,102 @@ .i_,=:_. -<s. This program is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/config.h> #include <qwidget.h> #include <qpixmap.h> #include <qbutton.h> #include <qpainter.h> #include <qframe.h> #include <qlayout.h> #include <qdir.h> #include <stdlib.h> #include <stdio.h> #include "oticker.h" OTicker::OTicker( QWidget* parent ) : QLabel( parent ) { // : QFrame( parent ) { setTextFormat(Qt::RichText); Config cfg("qpe"); cfg.setGroup("Appearance"); backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) ); foregroundcolor= Qt::black; updateTimerTime = 50; scrollLength = 1; } OTicker::~OTicker() { } -void OTicker::setBackgroundColor(QColor backcolor) { +void OTicker::setBackgroundColor(const QColor& backcolor) { backgroundcolor = backcolor; update(); } -void OTicker::setForegroundColor(QColor backcolor) { +void OTicker::setForegroundColor(const QColor& backcolor) { foregroundcolor = backcolor; update(); } void OTicker::setFrame(int frameStyle) { setFrameStyle( frameStyle/*WinPanel | Sunken */); update(); } void OTicker::setText( const QString& text ) { pos = 0; // reset it everytime the text is changed scrollText = text; qDebug(scrollText); int pixelLen = 0; bool bigger = false; int contWidth = contentsRect().width(); int contHeight = contentsRect().height(); int pixelTextLen = fontMetrics().width( text ); printf("<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length()); if( pixelTextLen < contWidth) { pixelLen = contWidth; } else { bigger = true; pixelLen = pixelTextLen; } QPixmap pm( pixelLen, contHeight); // pm.fill( QColor( 167, 212, 167 )); pm.fill(backgroundcolor); QPainter pmp( &pm ); pmp.setPen(foregroundcolor ); pmp.drawText( 0, 0, pixelTextLen, contHeight, AlignVCenter, scrollText ); pmp.end(); scrollTextPixmap = pm; killTimers(); // qDebug("Scrollupdate %d", updateTimerTime); if ( bigger /*pixelTextLen > contWidth*/ ) startTimer( updateTimerTime); update(); } void OTicker::timerEvent( QTimerEvent * ) { diff --git a/libopie/oticker.h b/libopie/oticker.h index c52e317..0b88919 100644 --- a/libopie/oticker.h +++ b/libopie/oticker.h @@ -33,106 +33,104 @@ #include <qwidget.h> #include <qpainter.h> #include <qdrawutil.h> #include <qpixmap.h> #include <qstring.h> #include <qslider.h> #include <qlabel.h> #include <qframe.h> #include <qcolor.h> /** * @class OTicker * @brief The OTicker class provides a QLabel widget that scroll its contents * */ class OTicker : public QLabel { Q_OBJECT public: /*! * @fn OTicker( QWidget* parent = 0 ) * @brief Object constructor. * * @param parent Pointer to parent of this control. * Constructs a new OTicker control with parent */ OTicker( QWidget* parent=0 ); /*! * @fn ~OTicker() * @brief Object destructor. */ ~OTicker(); /*! * @fn setText(const QString& ) * @brief sets text to be displayed * @param text QString text to be displayed. * */ void setText( const QString& text ) ; /*! * @fn setBackgroundColor(QColor color) * @brief sets color of the ticker's background * @param color QColor color to be set. * */ - //FIXME const QColor& please -zecke - void setBackgroundColor(QColor color); + void setBackgroundColor(const QColor& color); /*! * @fn setForegroundColor(QColor color) * @brief sets color of text * @param color QColor color of text * */ - // FIXME const QColor& please -zecke - void setForegroundColor(QColor color); + void setForegroundColor(const QColor& color); /*! * @fn setFrame(int style) * @brief sets frame style * @param style int Frame style to be see. See Qt::WidgetFlags. * */ void setFrame(int style); /*! * @fn setUpdateTime(int timeout) * @brief sets time of update * @param timeout int time in milliseconds between updates. * */ void setUpdateTime(int timeout); /*! * @fn setScrollLength(int length) * @brief sets amount of scrolling default is 1 * @param length int scroll length. * */ void setScrollLength(int length); signals: /*! * @fn mousePressed() * @brief signal mouse press event * */ void mousePressed(); protected: /*! * @fn timerEvent( QTimerEvent * e) * @brief timer timeout event * @param e QEvent see QEvent. * */ void timerEvent( QTimerEvent * e); /*! * @fn drawContents( QPainter *p ) * @brief draws widget contents * @param p QPainter. see QPainter * */ void drawContents( QPainter *p ); /*! * @fn mouseReleaseEvent( QMouseEvent *e) * @brief mouse release event * @param e QMouseEvent. see QMouseEvent. * |