1 files changed, 53 insertions, 46 deletions

diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp
index c05c2a8..2d8397e 100644
--- a/libqtaux/oticker.cpp
+++ b/libqtaux/oticker.cpp
@@ -30,17 +30,15 @@
 
-#include <qpe/config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "oticker.h"
 
+/* OPIE */
+#include <qpe/config.h>
+
 OTicker::OTicker( QWidget* parent )
-        : QLabel( parent ) {
-  //        : QFrame( parent ) {
-    setTextFormat(Qt::RichText);
-    Config cfg("qpe");
-    cfg.setGroup("Appearance");
+        : QLabel( parent )
+{
+    setTextFormat( Qt::RichText );
+    Config cfg( "qpe" );
+    cfg.setGroup( "Appearance" );
     backgroundcolor = QColor( cfg.readEntry( "Background", "#E5E1D5" ) );
-    foregroundcolor= Qt::black;
+    foregroundcolor = Qt::black;
     updateTimerTime = 50;
@@ -49,6 +47,7 @@ OTicker::OTicker( QWidget* parent )
 
-OTicker::~OTicker() {
-}
+OTicker::~OTicker()
+{}
 
-void OTicker::setBackgroundColor(const QColor& backcolor) {
+void OTicker::setBackgroundColor( const QColor& backcolor )
+{
     backgroundcolor = backcolor;
@@ -57,3 +56,4 @@ void OTicker::setBackgroundColor(const QColor& backcolor) {
 
-void OTicker::setForegroundColor(const QColor& backcolor) {
+void OTicker::setForegroundColor( const QColor& backcolor )
+{
     foregroundcolor = backcolor;
@@ -62,4 +62,5 @@ void OTicker::setForegroundColor(const QColor& backcolor) {
 
-void OTicker::setFrame(int frameStyle) {
-    setFrameStyle( frameStyle/*WinPanel | Sunken */);
+void OTicker::setFrame( int frameStyle )
+{
+    setFrameStyle( frameStyle /*WinPanel | Sunken */ );
     update();
@@ -67,28 +68,29 @@ void OTicker::setFrame(int frameStyle) {
 
-void OTicker::setText( const QString& text ) {
+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();
+    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)
+    qDebug( "<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length() );
+    if ( pixelTextLen < contWidth )
     {
-      pixelLen = contWidth;
+        pixelLen = contWidth;
     }
-  else
+    else
     {
         bigger = true;
-      pixelLen = pixelTextLen;
+        pixelLen = pixelTextLen;
     }
-    QPixmap pm( pixelLen, contHeight);
-//    pm.fill( QColor( 167, 212, 167 ));
- 
-    pm.fill(backgroundcolor);
+    QPixmap pm( pixelLen, contHeight );
+    //    pm.fill( QColor( 167, 212, 167 ));
+
+    pm.fill( backgroundcolor );
     QPainter pmp( &pm );
-    pmp.setPen(foregroundcolor );
+    pmp.setPen( foregroundcolor );
     pmp.drawText( 0, 0, pixelTextLen, contHeight, AlignVCenter, scrollText );
@@ -100,3 +102,3 @@ qDebug(scrollText);
     if ( bigger /*pixelTextLen > contWidth*/ )
-        startTimer( updateTimerTime);
+        startTimer( updateTimerTime );
     update();
@@ -105,4 +107,5 @@ qDebug(scrollText);
 
-void OTicker::timerEvent( QTimerEvent * ) {
-  pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - scrollLength;//1;
+void OTicker::timerEvent( QTimerEvent * )
+{
+    pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - scrollLength; //1;
     repaint( FALSE );
@@ -110,6 +113,7 @@ void OTicker::timerEvent( QTimerEvent * ) {
 
-void OTicker::drawContents( QPainter *p ) {
-    int pixelLen = scrollTextPixmap.width(); 
+void OTicker::drawContents( QPainter *p )
+{
+    int pixelLen = scrollTextPixmap.width();
     p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap );
-    if ( pixelLen > contentsRect().width() ) // Scrolling
+    if ( pixelLen > contentsRect().width() )  // Scrolling
         p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap );
@@ -117,4 +121,5 @@ void OTicker::drawContents( QPainter *p ) {
 
-void OTicker::mouseReleaseEvent( QMouseEvent * ) {
-//    qDebug("<<<<<<<>>>>>>>>>");
+void OTicker::mouseReleaseEvent( QMouseEvent * )
+{
+    //    qDebug("<<<<<<<>>>>>>>>>");
     emit mousePressed();
@@ -122,8 +127,10 @@ void OTicker::mouseReleaseEvent( QMouseEvent * ) {
 
-void OTicker::setUpdateTime(int time) {
- updateTimerTime=time;
+void OTicker::setUpdateTime( int time )
+{
+    updateTimerTime = time;
 }
 
-void OTicker::setScrollLength(int len) {
-scrollLength=len;
+void OTicker::setScrollLength( int len )
+{
+    scrollLength = len;
 }