Small fixes

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=462249

diff --git a/extdate/extdatewidget.h b/extdate/extdatewidget.h
index f76d7d6e40bf60a3e19b2e0e1e46e4d0f0374157..4e785ac6a240b0cd5dfdc97a151fc0dedb80a80b 100644 (file)
--- 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 c882f78b14670ed02c8220cc4af6df47961a1e3d..0f78d6eb6c5cccdf04b31ea68ea6670c663427cd 100644 (file)
--- 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 d4a2d0dd5ed656de0590eb32dd0e65bf7ac65dad..e26c3d0d23f90ae0447fe67d5ae2eda92a225441 100644 (file)
--- 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 c2a31871e5ce12b7648021100b43b1f0e067b076..4217bd49a94e3ee1305f8b8c8c43782820478611 100644 (file)
--- 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 fed9a037e030f560ca8403b74197e02d84959c01..247cabf2aca13f738eaf32f6d8fb8b8474d87680 100644 (file)
--- a/kdeeduui/kdeeduglossary.cpp
+++ b/kdeeduui/kdeeduglossary.cpp
@@ -193,8 +193,8 @@ QList<GlossaryItem*> 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 3dc8a3c2c72b2b411913b279cfa11864f2331f68..3f8deb16ac37d79dcfe3e0c489c0ada33e4a3567 100644 (file)
--- 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();
 
                /**