correct copyright and license

2 files changed, 10 insertions, 6 deletions

diff --git a/libopie/oticker.cpp b/libopie/oticker.cpp
index c05c2a8..b41cab6 100644
--- a/libopie/oticker.cpp
+++ b/libopie/oticker.cpp
@@ -1,72 +1,74 @@
 /*
                             This file is part of the Opie Project
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
+                             Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .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
+..}^=.=       =       ;      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.
+  -_. . .   )=.  =           General Public License along with
+    --        :-=`           this; 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"
 
 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(const QColor& backcolor) {
     backgroundcolor = backcolor;
     update();
 }
 
 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);
  
diff --git a/libopie/oticker.h b/libopie/oticker.h
index 4026eb5..45bf7ce 100644
--- a/libopie/oticker.h
+++ b/libopie/oticker.h
@@ -1,72 +1,74 @@
 /*
                             This file is part of the Opie Project
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
+                             Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+                             
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .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
+..}^=.=       =       ;      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.
+  -_. . .   )=.  =           General Public License along with
+    --        :-=`           this; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef OTICKER_H
 #define OTICKER_H
 
 #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.
  *