author | erik <erik> | 2007-01-10 17:24:23 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-10 17:24:23 (UTC) |
commit | e7d3e1d0f3c75979c01ea6373ed3c80d0c986000 (patch) (side-by-side diff) | |
tree | 34a6e8aa3de82f07c0531e59f375da216fbfb97a | |
parent | 51bd5e8d542372ad54898ce642fe9b82b8ba83f3 (diff) | |
download | opie-e7d3e1d0f3c75979c01ea6373ed3c80d0c986000.zip opie-e7d3e1d0f3c75979c01ea6373ed3c80d0c986000.tar.gz opie-e7d3e1d0f3c75979c01ea6373ed3c80d0c986000.tar.bz2 |
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.
-rw-r--r-- | core/pim/datebook/holiday/national/nationalcfg.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/holiday/national/nationalcfg.h | 2 | ||||
-rw-r--r-- | inputmethods/handwriting/qimpenwidget.cpp | 2 | ||||
-rw-r--r-- | inputmethods/handwriting/qimpenwidget.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/odatebookaccessbackend_xml.h | 2 | ||||
-rw-r--r-- | library/lightstyle.cpp | 8 | ||||
-rw-r--r-- | library/lightstyle.h | 8 |
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 @@ -278,3 +278,3 @@ bool NHcfg::endElement(const QString&, const QString&,const QString& name) -const QString&NHcfg::errorString()const
+QString NHcfg::errorString() const
{
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 @@ -59,3 +59,3 @@ public: virtual bool endElement(const QString&, const QString&,const QString& name);
- virtual const QString&errorString()const;
+ virtual QString errorString()const;
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 @@ -284,3 +284,3 @@ bool QIMPenWidget::selectSet( QPoint p ) */ -QSize QIMPenWidget::sizeHint() +QSize QIMPenWidget::sizeHint() const { 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 @@ -39,3 +39,3 @@ public: void showCharacter( QIMPenChar *, int speed = 10 ); - virtual QSize sizeHint(); + virtual QSize sizeHint() const; 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 @@ -293,3 +293,3 @@ QArray<int> ODateBookAccessBackend_XML::allRecords()const { } -QArray<int> ODateBookAccessBackend_XML::queryByExample(const OPimEvent&, int, const QDateTime& ) { +QArray<int> ODateBookAccessBackend_XML::queryByExample(const OPimEvent&, int, const QDateTime& ) const { return QArray<int>(); 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 @@ -54,3 +54,3 @@ public: 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; diff --git a/library/lightstyle.cpp b/library/lightstyle.cpp index c5073ca..3d5adfb 100644 --- a/library/lightstyle.cpp +++ b/library/lightstyle.cpp @@ -392,3 +392,3 @@ 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) { @@ -427,3 +427,3 @@ 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 ) { @@ -442,3 +442,3 @@ 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 ) { @@ -803,3 +803,3 @@ void LightStyle::scrollBarMetrics(const QScrollBar *scrollbar, int &sliderMin, int &sliderMax, - int &sliderLength, int &buttonDim) const + int &sliderLength, int &buttonDim) { diff --git a/library/lightstyle.h b/library/lightstyle.h index 0392957..52e19b2 100644 --- a/library/lightstyle.h +++ b/library/lightstyle.h @@ -58,3 +58,3 @@ public: const QBrush *fill = 0); - void getButtonShift(int &x, int &y) const; + void getButtonShift(int &x, int &y); @@ -64,4 +64,4 @@ public: 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); @@ -82,3 +82,3 @@ public: void scrollBarMetrics( const QScrollBar *, - int &, int &, int &, int & ) const; + int &, int &, int &, int & ); void drawScrollBarControls(QPainter* p, const QScrollBar* sb, |