From 33e0933befe84be1a70eb80f3c4988bfca15ca89 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 20 Sep 2005 13:26:40 +0000 Subject: [PATCH] Small fixes svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=462249 --- extdate/extdatewidget.h | 4 ++-- kdeeduplot/kplotobject.h | 2 +- kdeeduplot/kplotwidget.cpp | 4 ++-- kdeeduplot/kplotwidget.h | 6 +++--- kdeeduui/kdeeduglossary.cpp | 4 ++-- kdeeduui/kdeeduglossary.h | 3 +-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/extdate/extdatewidget.h b/extdate/extdatewidget.h index f76d7d6..4e785ac 100644 --- a/extdate/extdatewidget.h +++ b/extdate/extdatewidget.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef __EXTDATEWIDGET_H__ -#define __EXTDATEWIDGET_H__ +#ifndef EXTDATEWIDGET_H +#define EXTDATEWIDGET_H #include "extdatetime.h" diff --git a/kdeeduplot/kplotobject.h b/kdeeduplot/kplotobject.h index c882f78..0f78d6e 100644 --- a/kdeeduplot/kplotobject.h +++ b/kdeeduplot/kplotobject.h @@ -66,7 +66,7 @@ public: double x() const { return X; } double y() const { return Y; } - QPoint qpoint( QRect pb, DRect db ) { + QPoint qpoint( const QRect& pb, const DRect& db ) { int px = pb.left() + int( pb.width()*( x() - db.x() )/db.width() ); int py = pb.top() + int( pb.height()*( db.y2() - y() )/db.height() ); return QPoint( px, py ); diff --git a/kdeeduplot/kplotwidget.cpp b/kdeeduplot/kplotwidget.cpp index d4a2d0d..e26c3d0 100644 --- a/kdeeduplot/kplotwidget.cpp +++ b/kdeeduplot/kplotwidget.cpp @@ -25,8 +25,8 @@ #include "kplotwidget.h" #include "kplotwidget.moc" -KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, QWidget *parent, const char* name ) - : QWidget( parent, name, Qt::WNoAutoErase ), +KPlotWidget::KPlotWidget( double x1, double x2, double y1, double y2, QWidget *parent ) + : QWidget( parent, Qt::WNoAutoErase ), dXtick(0.0), dYtick(0.0), nmajX(0), nminX(0), nmajY(0), nminY(0), ShowTickMarks( true ), ShowTickLabels( true ), ShowGrid( false ) diff --git a/kdeeduplot/kplotwidget.h b/kdeeduplot/kplotwidget.h index c2a3187..4217bd4 100644 --- a/kdeeduplot/kplotwidget.h +++ b/kdeeduplot/kplotwidget.h @@ -56,7 +56,7 @@ public: * @param parent the parent widget * @param name name label for the KPlotWidget */ - KPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, QWidget *parent=0, const char* name=0 ); + KPlotWidget( double x1=0.0, double x2=1.0, double y1=0.0, double y2=1.0, QWidget *parent=0 ); /** * Destructor (empty) @@ -199,7 +199,7 @@ public: * This function is deprecated, set the label property in the BottomAxis directly. * @param xlabel a short string describing the data plotted on the x-axis. */ - virtual void setXAxisLabel( QString xlabel ) { BottomAxis.setLabel(xlabel); } + virtual void setXAxisLabel( const QString& xlabel ) { BottomAxis.setLabel(xlabel); } /** * Sets the Y-axis label * Set the label to an empty string to omit the axis label. @@ -207,7 +207,7 @@ public: * This function is deprecated, set the label property in the LeftAxis directly. * @param ylabel a short string describing the data plotted on the y-axis. */ - virtual void setYAxisLabel( QString ylabel ) { LeftAxis.setLabel(ylabel); } + virtual void setYAxisLabel( const QString& ylabel ) { LeftAxis.setLabel(ylabel); } /** * @returns the number of pixels to the left of the plot area. diff --git a/kdeeduui/kdeeduglossary.cpp b/kdeeduui/kdeeduglossary.cpp index fed9a03..247cabf 100644 --- a/kdeeduui/kdeeduglossary.cpp +++ b/kdeeduui/kdeeduglossary.cpp @@ -193,8 +193,8 @@ QList Glossary::readItems( QDomDocument &itemDocument ) return list; } -GlossaryDialog::GlossaryDialog( bool folded, QWidget *parent, const char *name) - : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, parent, name, false ) +GlossaryDialog::GlossaryDialog( bool folded, QWidget *parent ) + : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, parent, "glossary-dialog", false ) { //this string will be used for all items. If a backgroundpicture should //be used call Glossary::setBackgroundPicture(). diff --git a/kdeeduui/kdeeduglossary.h b/kdeeduui/kdeeduglossary.h index 3dc8a3c..3f8deb1 100644 --- a/kdeeduui/kdeeduglossary.h +++ b/kdeeduui/kdeeduglossary.h @@ -252,9 +252,8 @@ class GlossaryDialog : public KDialogBase * @param folded whether to fold the various items in subtrees depending on the * first letter of every item * @param parent the parent of the new dialog - * @param name the optional name of the new dialog */ - GlossaryDialog( bool folded = true, QWidget *parent=0, const char *name=0); + GlossaryDialog( bool folded = true, QWidget *parent = 0 ); ~GlossaryDialog(); /** -- 2.47.3