All of the files in this commit have an inheritance member function

mismatch correction. None are serious, but all would have been improperly
mislinked in the inheritance hierarchy if attempted to be used.

8 files changed, 14 insertions, 14 deletions

diff --git a/core/pim/datebook/holiday/national/nationalcfg.cpp b/core/pim/datebook/holiday/national/nationalcfg.cpp
index f71c833..33e9db3 100644
--- a/core/pim/datebook/holiday/national/nationalcfg.cpp
+++ b/core/pim/datebook/holiday/national/nationalcfg.cpp
@@ -255,49 +255,49 @@ bool NHcfg::parseCalc(const QString&name,const QXmlAttributes&attr)
     }

     return true;

 }

 

 bool NHcfg::endElement(const QString&, const QString&,const QString& name)

 {

 //    odebug << "End element: " << name << oendl;

     if (name==_key_entry) {

         if (m_currentEntry.type()==NHentry::fix) {

             currentFixList.append(m_currentEntry);

         } else {

             currentFloatList.append(m_currentEntry);

 //            odebug << "Floatlist count " << currentFloatList.count() << oendl;

         }

     } else if (name==_key_calc) {

 

     }

     if (stage>=3) {

         --level;

     }

 //    odebug << "Level == " << level << oendl;

     return true;

 }

 

-const QString&NHcfg::errorString()const

+QString NHcfg::errorString() const

 {

     return err;

 }

 

 NHentry::NHentry()

     :m_Type(fix)

 {

     m_Offset=0;

 }

 

 NHentry::~NHentry()

 {}

 

 void NHentry::setName(const QString&aName)

 {

     m_Name = aName;

 }

 

 const QString&NHentry::name()const

 {

     return m_Name;

 }

 

 void NHentry::setType(NHentry::entry_type aType)

diff --git a/core/pim/datebook/holiday/national/nationalcfg.h b/core/pim/datebook/holiday/national/nationalcfg.h
index 872df65..2aedd95 100644
--- a/core/pim/datebook/holiday/national/nationalcfg.h
+++ b/core/pim/datebook/holiday/national/nationalcfg.h
@@ -36,40 +36,40 @@ public:
 protected:

     entry_type m_Type;

     QString m_Name,m_Weekday,m_Dayofmonth,m_Depth,m_Month;

     QDate m_Date;

     int m_Offset;

 };

 

 typedef QValueList<NHentry> tentrylist;

 

 class NHcfg:public QXmlDefaultHandler

 {

 public:

     NHcfg();

     virtual ~NHcfg();

 

     bool load(const QString&);

     const tentrylist&fixDates()const;

     const tentrylist&floatingDates()const;

 

     virtual bool warning(const QXmlParseException& e);

     virtual bool error(const QXmlParseException& e);

     virtual bool fatalError(const QXmlParseException& e);

     virtual bool startElement(const QString&, const QString&,const QString& name, const QXmlAttributes& attr);

     virtual bool endElement(const QString&, const QString&,const QString& name);

-    virtual const QString&errorString()const;

+    virtual QString errorString()const;

 

 protected:

     QString err,_contentname;

     QString _path;

 

     NHentry m_currentEntry;

 

     bool setName(const QXmlAttributes&);

     bool parsevalue(const QString&,const QXmlAttributes&);

     bool parseCalc(const QString&,const QXmlAttributes&);

     int stage,counter,level;

     tentrylist currentFloatList,currentFixList;

 };

 

 #endif

diff --git a/inputmethods/handwriting/qimpenwidget.cpp b/inputmethods/handwriting/qimpenwidget.cpp
index 8f8f582..7223e1a 100644
--- a/inputmethods/handwriting/qimpenwidget.cpp
+++ b/inputmethods/handwriting/qimpenwidget.cpp
@@ -261,49 +261,49 @@ bool QIMPenWidget::selectSet( QPoint p )
         CharSetEntryIterator it( charSets );
         int spos = 0;
         int idx = 0;
         for ( ; it.current(); ++it, idx++ ) {
             int setWidth = width() * it.current()->stretch / totalStretch;
             spos += setWidth;
             if ( p.x() < spos ) {
                 if ( idx != currCharSet ) {
                     currCharSet = idx;
                     update( 0, 0, width(), 12 );
                     emit changeCharSet( currCharSet );
                     emit changeCharSet( charSets.at(currCharSet)->cs );
                 }
                 break;
             }
         }
     }
 
     return FALSE;
 }
 
 /*!
   Hopefully returns a sensible size.
 */
-QSize QIMPenWidget::sizeHint()
+QSize QIMPenWidget::sizeHint() const
 {
     return QSize( TITLE_WIDTH * charSets.count(), 75 );
 }
 
 void QIMPenWidget::mousePressEvent( QMouseEvent *e )
 {
     if ( !readOnly && e->button() == LeftButton && mode == Waiting ) {
         // if selectSet returns false the click was not over the
         // char set selectors.
         if ( !selectSet( e->pos() ) ) {
             // start of character input
             timer->stop();
             if ( outputChar ) {
                 outputChar = 0;
                 outputStroke = 0;
                 repaint();
             }
             mode = Input;
             lastPoint = e->pos();
             emit beginStroke();
             inputStroke = new QIMPenStroke;
             strokes.append( inputStroke );
             inputStroke->beginInput( e->pos() );
             QPainter paint( this );
diff --git a/inputmethods/handwriting/qimpenwidget.h b/inputmethods/handwriting/qimpenwidget.h
index 98d7f5c..d156554 100644
--- a/inputmethods/handwriting/qimpenwidget.h
+++ b/inputmethods/handwriting/qimpenwidget.h
@@ -16,49 +16,49 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qwidget.h>
 #include <qlist.h>
 #include "qimpenchar.h"
 
 class QIMPenWidget : public QWidget
 {
     Q_OBJECT
 public:
     QIMPenWidget( QWidget *parent );
 
     void clear();
     void greyStroke();
     void setReadOnly( bool r ) { readOnly = r; }
 
     void insertCharSet( QIMPenCharSet *cs, int stretch=1, int pos=-1 );
     void removeCharSet( int );
     void changeCharSet( QIMPenCharSet *cs, int pos );
     void clearCharSets();
     void showCharacter( QIMPenChar *, int speed = 10 );
-    virtual QSize sizeHint();
+    virtual QSize sizeHint() const;
 
 public slots:
     void removeStroke();
 
 signals:
     void changeCharSet( QIMPenCharSet *cs );
     void changeCharSet( int );
     void beginStroke();
     void stroke( QIMPenStroke *ch );
 
 protected slots:
     void timeout();
 
 protected:
     enum Mode { Waiting, Input, Output };
     bool selectSet( QPoint );
     virtual void mousePressEvent( QMouseEvent *e );
     virtual void mouseReleaseEvent( QMouseEvent *e );
     virtual void mouseMoveEvent( QMouseEvent *e );
     virtual void paintEvent( QPaintEvent *e );
     virtual void resizeEvent( QResizeEvent *e );
 
     struct CharSetEntry {
         QIMPenCharSet *cs;
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
index 55e47e2..2ebccd2 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
@@ -270,49 +270,49 @@ bool ODateBookAccessBackend_XML::save() {
     if ( ::rename( strFileNew, m_name ) < 0 ) {
         QFile::remove( strFileNew );
         return false;
     }
 
     m_changed = false;
     return true;
 }
 QArray<int> ODateBookAccessBackend_XML::allRecords()const {
     QArray<int> ints( m_raw.count()+ m_rep.count() );
     uint i = 0;
     QMap<int, OPimEvent>::ConstIterator it;
 
     for ( it = m_raw.begin(); it != m_raw.end(); ++it ) {
         ints[i] = it.key();
         i++;
     }
     for ( it = m_rep.begin(); it != m_rep.end(); ++it ) {
         ints[i] = it.key();
         i++;
     }
 
     return ints;
 }
-QArray<int> ODateBookAccessBackend_XML::queryByExample(const OPimEvent&, int,  const QDateTime& ) {
+QArray<int> ODateBookAccessBackend_XML::queryByExample(const OPimEvent&, int,  const QDateTime& ) const {
     return QArray<int>();
 }
 void ODateBookAccessBackend_XML::clear() {
     m_changed = true;
     m_raw.clear();
     m_rep.clear();
 }
 OPimEvent ODateBookAccessBackend_XML::find( int uid ) const{
     if ( m_raw.contains( uid ) )
         return m_raw[uid];
     else
         return m_rep[uid];
 }
 bool ODateBookAccessBackend_XML::add( const OPimEvent& ev ) {
     m_changed = true;
     if (ev.hasRecurrence() )
         m_rep.insert( ev.uid(), ev );
     else
         m_raw.insert( ev.uid(), ev );
 
     return true;
 }
 bool ODateBookAccessBackend_XML::remove( int uid ) {
     m_changed = true;
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_xml.h b/libopie2/opiepim/backend/odatebookaccessbackend_xml.h
index cb19f76..7369c07 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_xml.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_xml.h
@@ -31,49 +31,49 @@
 
 #include <qmap.h>
 
 #include <opie2/odatebookaccessbackend.h>
 
 namespace Opie {
 /**
  * This is the default XML implementation for DateBoook XML storage
  * It fully implements the interface
  * @see ODateBookAccessBackend
  * @see OPimAccessBackend
  */
 class ODateBookAccessBackend_XML : public ODateBookAccessBackend {
 public:
     ODateBookAccessBackend_XML( const QString& appName,
                                 const QString& fileName = QString::null);
     ~ODateBookAccessBackend_XML();
 
     bool load();
     bool reload();
     bool save();
 
     QArray<int> allRecords()const;
     QArray<int> matchRegexp(const QRegExp &r) const;
-    QArray<int> queryByExample( const OPimEvent&, int, const QDateTime& d = QDateTime() );
+    QArray<int> queryByExample( const OPimEvent&, int, const QDateTime& d = QDateTime() )const;
     OPimEvent find( int uid )const;
     void clear();
     bool add( const OPimEvent& ev );
     bool remove( int uid );
     bool replace( const OPimEvent& ev );
 
     QArray<UID> rawEvents()const;
     QArray<UID> rawRepeats()const;
     QArray<UID> nonRepeats()const;
 
     OPimEvent::ValueList directNonRepeats()const;
     OPimEvent::ValueList directRawRepeats()const;
 
 private:
     bool m_changed :1 ;
     bool m_noTimeZone : 1;
 
     bool loadFile();
     inline void finalizeRecord( OPimEvent& ev );
     inline void setField( OPimEvent&, int field, const QString& val );
     QString m_name;
     QMap<int, OPimEvent> m_raw;
     QMap<int, OPimEvent> m_rep;
 
diff --git a/library/lightstyle.cpp b/library/lightstyle.cpp
index c5073ca..3d5adfb 100644
--- a/library/lightstyle.cpp
+++ b/library/lightstyle.cpp
@@ -369,99 +369,99 @@ void LightStyle::drawButton(QPainter *p, int x, int y, int w, int h,
 
     p->drawLine(x + 1, y + 2, x + 1, y + h - 3); // left
     p->drawLine(x + 2, y + 1, x + w - 3, y + 1); // top
 
     if (sunken)
         p->setPen(g.light());
     else
         p->setPen(g.mid());
 
     p->drawLine(x + w - 2, y + 2, x + w - 2, y + h - 3); // right + 1
     p->drawLine(x + 2, y + h - 2, x + w - 3, y + h - 2); // bottom + 1
 
     p->restore();
 }
 
 
 void LightStyle::drawBevelButton(QPainter *p, int x, int y, int w, int h,
                                       const QColorGroup &g,
                                       bool sunken, const QBrush *fill)
 {
     drawButton(p, x, y, w, h, g, sunken, fill);
 }
 
 
-void LightStyle::getButtonShift(int &x, int &y) const
+void LightStyle::getButtonShift(int &x, int &y)
 {
     x = y = 0;
 }
 
 
 void LightStyle::drawComboButton(QPainter *p, int x, int y, int w, int h,
                                const QColorGroup &g, bool,
                                bool editable, bool,
                                const QBrush *fill)
 {
     drawButton(p, x, y, w, h, g, FALSE, fill);
 
     if (editable) {
         QRect r = comboButtonRect(x, y, w, h);
         qDrawShadePanel(p, r.x() - 1, r.y() - 1,
                         r.width() + defaultFrameWidth(),
                         r.height() + defaultFrameWidth(),
                         g, TRUE);
     }
 
     int indent = ((y + h) / 2) - 3;
     int xpos = x;
 
 #if QT_VERSION >= 0x030000
     if( QApplication::reverseLayout() )
         xpos += indent;
     else
 #endif
         xpos += w - indent - 5;
 
     drawArrow(p, Qt::DownArrow, TRUE, xpos, indent, 5, 5, g, TRUE, fill);
 }
 
 
-QRect LightStyle::comboButtonRect( int x, int y, int w, int h ) const
+QRect LightStyle::comboButtonRect( int x, int y, int w, int h )
 {
     QRect r(x + 3, y + 3, w - 6, h - 6);
     int indent = ((y + h) / 2) - 3;
     r.setRight(r.right() - indent - 10);
 
 #if QT_VERSION >= 0x030000
     if( QApplication::reverseLayout() )
         r.moveBy( indent + 10, 0 );
 #endif
 
     return r;
 }
 
 
-QRect LightStyle::comboButtonFocusRect(int x, int y, int w, int h ) const
+QRect LightStyle::comboButtonFocusRect(int x, int y, int w, int h )
 {
     return comboButtonRect(x, y, w, h);
 }
 
 
 void LightStyle::drawPanel(QPainter *p, int x, int y, int w, int h,
                          const QColorGroup &g, bool sunken,
                          int lw, const QBrush *fill)
 {
     if (lw >= 2) {
         if ( fill )
             p->fillRect(x + 2, y + 2, w - 4, h - 4, *fill);
 
         QPen oldpen = p->pen();
 
         // frame
         p->setPen(g.dark());
         p->drawLine(x, y + 2, x, y + h - 3); // left
         p->drawLine(x + 2, y, x + w - 3, y); // top
         p->drawLine(x + w - 1, y + 2, x + w - 1, y + h - 3); // right
         p->drawLine(x + 2, y + h - 1, x + w - 3, y + h - 1); // bottom
         p->drawPoint(x + 1, y + 1);
         p->drawPoint(x + 1, y + h - 2);
         p->drawPoint(x + w - 2, y + 1);
@@ -780,49 +780,49 @@ void LightStyle::drawSlider(QPainter *p, int x, int y, int w, int h,
     } else {
         if (above && below) {
             drawArrow(p, Qt::LeftArrow, FALSE, x + 1, y, w / 2, h, g, TRUE);
             drawArrow(p, Qt::RightArrow, FALSE, x + (w / 2) - 2, y, w / 2, h, g, TRUE);
         } else
             drawArrow(p, (above) ? Qt::LeftArrow : Qt::RightArrow,
                       FALSE, x, y, w, h, g, TRUE);
     }
 }
 
 
 void LightStyle::drawSliderGroove(QPainter *p, int x, int y, int w, int h,
                                 const QColorGroup& g, QCOORD c,
                                 Qt::Orientation orientation)
 {
     if (orientation == Horizontal)
         drawButton(p, x, y+c - 3, w, 6, g, TRUE, &g.brush(QColorGroup::Mid));
     else
         drawButton(p, x+c - 3, y, 6, h, g, TRUE, &g.brush(QColorGroup::Mid));
 }
 
 
 void LightStyle::scrollBarMetrics(const QScrollBar *scrollbar,
                                        int &sliderMin, int &sliderMax,
-                                       int &sliderLength, int &buttonDim) const
+                                       int &sliderLength, int &buttonDim)
 {
     int maxLength;
     int length = ((scrollbar->orientation() == Horizontal) ?
                   scrollbar->width() : scrollbar->height());
     int extent = ((scrollbar->orientation() == Horizontal) ?
                   scrollbar->height() : scrollbar->width());
     extent--;
 
     if (length > (extent + defaultFrameWidth() - 1) * 2 + defaultFrameWidth())
         buttonDim = extent - defaultFrameWidth();
     else
         buttonDim = (length - defaultFrameWidth()) / 2 - 1;
 
     sliderMin = buttonDim;
     maxLength = length - buttonDim * 3;
 
     if (scrollbar->maxValue() != scrollbar->minValue()) {
         uint range = scrollbar->maxValue() - scrollbar->minValue();
         sliderLength = (scrollbar->pageStep() * maxLength) /
                        (range + scrollbar->pageStep());
 
         if (sliderLength < buttonDim || range > INT_MAX / 2)
             sliderLength = buttonDim;
         if (sliderLength > maxLength)
diff --git a/library/lightstyle.h b/library/lightstyle.h
index 0392957..52e19b2 100644
--- a/library/lightstyle.h
+++ b/library/lightstyle.h
@@ -35,73 +35,73 @@
 #endif // QT_PLUGIN_STYLE_LIGHT
 
 
 class Q_EXPORT_STYLE_LIGHT LightStyle : public QWindowsStyle
 {
 public:
     LightStyle();
     virtual ~LightStyle();
 
     void polish(QWidget *widget);
     void unPolish(QWidget*widget);
 
     void polish(QApplication *app);
     void unPolish(QApplication *app);
 
     void polishPopupMenu(QPopupMenu *menu);
 
     void drawPushButton(QPushButton *button, QPainter *p);
     void drawButton(QPainter *p, int x, int y, int w, int h,
                     const QColorGroup &g, bool sunken = FALSE,
                     const QBrush *fill = 0);
     void drawBevelButton(QPainter *p, int x, int y, int w, int h,
                          const QColorGroup &g, bool sunken = FALSE,
                          const QBrush *fill = 0);
-    void getButtonShift(int &x, int &y) const;
+    void getButtonShift(int &x, int &y);
 
     void drawComboButton(QPainter *p, int x, int y, int w, int h,
                          const QColorGroup &g, bool sunken = FALSE,
                          bool editable = FALSE, bool = TRUE,
                          const QBrush *fill = 0);
-    QRect comboButtonRect(int x, int y, int w, int h) const;
-    QRect comboButtonFocusRect(int x, int y, int w, int h) const;
+    QRect comboButtonRect(int x, int y, int w, int h);
+    QRect comboButtonFocusRect(int x, int y, int w, int h);
 
     void drawIndicator(QPainter *p, int x, int y ,int w, int h,
                        const QColorGroup &g, int state,
                        bool = FALSE, bool = TRUE);
     QSize indicatorSize() const;
 
     void drawExclusiveIndicator(QPainter *p, int x, int y ,int w, int h,
                                 const QColorGroup &g, bool on,
                                 bool = FALSE, bool = TRUE);
     QSize exclusiveIndicatorSize() const;
 
     void drawPanel(QPainter * p, int x, int y, int w, int h,
                    const QColorGroup &g, bool sunken = FALSE,
                    int = 1, const QBrush * = 0);
 
     void scrollBarMetrics( const QScrollBar *,
-                           int &, int &, int &, int & ) const;
+                           int &, int &, int &, int & );
     void drawScrollBarControls(QPainter* p, const QScrollBar* sb,
                                int sliderStart, uint controls,
                                uint activeControl);
     QStyle::ScrollControl scrollBarPointOver(const QScrollBar *, int, const QPoint& p);
 
     void drawTab(QPainter *p, const QTabBar *tabbar, QTab *tab, bool selected);
 
     void drawSlider(QPainter *p, int x, int y, int w, int h,
                     const QColorGroup &g, Qt::Orientation orientation,
                     bool, bool);
     void drawSliderGroove(QPainter *p, int x, int y, int w, int h,
                           const QColorGroup& g, QCOORD,
                           Qt::Orientation );
 
     void drawToolBarHandle(QPainter *, const QRect &, Qt::Orientation,
                            bool, const QColorGroup &, bool = FALSE );
 
     QSize scrollBarExtent() const;
     int buttonDefaultIndicatorWidth() const;
     int buttonMargin() const;
     int sliderThickness() const;
     int sliderLength() const;
     int defaultFrameWidth() const;