reorder includes, printf-->qdebug, reformat source

1 files changed, 26 insertions, 19 deletions

diff --git a/libqtaux/oticker.cpp b/libqtaux/oticker.cpp
index c05c2a8..2d8397e 100644
--- a/libqtaux/oticker.cpp
+++ b/libqtaux/oticker.cpp
@@ -15,116 +15,123 @@
      +  .  -:.       =       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/config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "oticker.h"
 
+/* OPIE */
+#include <qpe/config.h>
+
 OTicker::OTicker( QWidget* parent )
-        : QLabel( parent ) {
-  //        : QFrame( parent ) {
+        : QLabel( 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() {
-}
+OTicker::~OTicker()
+{}
 
-void OTicker::setBackgroundColor(const QColor& backcolor) {
+void OTicker::setBackgroundColor( const QColor& backcolor )
+{
     backgroundcolor = backcolor;
     update();
 }
 
-void OTicker::setForegroundColor(const QColor& backcolor) {
+void OTicker::setForegroundColor( const QColor& backcolor )
+{
     foregroundcolor = backcolor;
     update();
 }
 
-void OTicker::setFrame(int frameStyle) {
+void OTicker::setFrame( int frameStyle )
+{
     setFrameStyle( frameStyle/*WinPanel | Sunken */);
     update();
 }
 
-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();
     int pixelTextLen = fontMetrics().width( text );
-    printf("<<<<<<<height %d, width %d, text width %d %d\n", contHeight, contWidth, pixelTextLen, scrollText.length());
+    qDebug( "<<<<<<<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 * ) {
+void OTicker::timerEvent( QTimerEvent * )
+{
   pos = ( pos <= 0 ) ? scrollTextPixmap.width() : pos - scrollLength;//1;
     repaint( FALSE );
 }
 
-void OTicker::drawContents( QPainter *p ) {
+void OTicker::drawContents( QPainter *p )
+{
     int pixelLen = scrollTextPixmap.width(); 
     p->drawPixmap( pos, contentsRect().y(), scrollTextPixmap );
     if ( pixelLen > contentsRect().width() ) // Scrolling
         p->drawPixmap( pos - pixelLen, contentsRect().y(), scrollTextPixmap );
 }
 
-void OTicker::mouseReleaseEvent( QMouseEvent * ) {
+void OTicker::mouseReleaseEvent( QMouseEvent * )
+{
 //    qDebug("<<<<<<<>>>>>>>>>");
     emit mousePressed();
 }
 
-void OTicker::setUpdateTime(int time) {
+void OTicker::setUpdateTime( int time )
+{
  updateTimerTime=time;
 }
 
-void OTicker::setScrollLength(int len) {
+void OTicker::setScrollLength( int len )
+{
 scrollLength=len;
 }