From e7d3e1d0f3c75979c01ea6373ed3c80d0c986000 Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 10 Jan 2007 17:24:23 +0000 Subject: 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. --- 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 @@ -276,7 +276,7 @@ bool NHcfg::endElement(const QString&, const QString&,const QString& name) return true; } -const QString&NHcfg::errorString()const +QString NHcfg::errorString() const { return err; } 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 @@ -57,7 +57,7 @@ public: 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; 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 @@ -282,7 +282,7 @@ bool QIMPenWidget::selectSet( QPoint p ) /*! Hopefully returns a sensible size. */ -QSize QIMPenWidget::sizeHint() +QSize QIMPenWidget::sizeHint() const { return QSize( TITLE_WIDTH * charSets.count(), 75 ); } 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 @@ -37,7 +37,7 @@ public: 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(); 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 @@ -291,7 +291,7 @@ QArray ODateBookAccessBackend_XML::allRecords()const { return ints; } -QArray ODateBookAccessBackend_XML::queryByExample(const OPimEvent&, int, const QDateTime& ) { +QArray ODateBookAccessBackend_XML::queryByExample(const OPimEvent&, int, const QDateTime& ) const { return QArray(); } void ODateBookAccessBackend_XML::clear() { 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 @@ -52,7 +52,7 @@ public: QArray allRecords()const; QArray matchRegexp(const QRegExp &r) const; - QArray queryByExample( const OPimEvent&, int, const QDateTime& d = QDateTime() ); + QArray queryByExample( const OPimEvent&, int, const QDateTime& d = QDateTime() )const; OPimEvent find( int uid )const; void clear(); bool add( const OPimEvent& ev ); diff --git a/library/lightstyle.cpp b/library/lightstyle.cpp index c5073ca..3d5adfb 100644 --- a/library/lightstyle.cpp +++ b/library/lightstyle.cpp @@ -390,7 +390,7 @@ void LightStyle::drawBevelButton(QPainter *p, int x, int y, int w, int h, } -void LightStyle::getButtonShift(int &x, int &y) const +void LightStyle::getButtonShift(int &x, int &y) { x = y = 0; } @@ -425,7 +425,7 @@ void LightStyle::drawComboButton(QPainter *p, int x, int y, int w, int h, } -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; @@ -440,7 +440,7 @@ QRect LightStyle::comboButtonRect( int x, int y, int w, int h ) const } -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); } @@ -801,7 +801,7 @@ void LightStyle::drawSliderGroove(QPainter *p, int x, int y, int w, int h, 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) ? diff --git a/library/lightstyle.h b/library/lightstyle.h index 0392957..52e19b2 100644 --- a/library/lightstyle.h +++ b/library/lightstyle.h @@ -56,14 +56,14 @@ public: 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, @@ -80,7 +80,7 @@ public: 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); -- cgit v0.9.0.2