diff -Naur kmatplot-0.4/kmatplot/dialogs/ksattrpanel.cpp kmatplot-0.4mdk/kmatplot/dialogs/ksattrpanel.cpp --- kmatplot-0.4/kmatplot/dialogs/ksattrpanel.cpp 2002-02-07 11:34:06.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/dialogs/ksattrpanel.cpp 2002-12-16 18:54:43.000000000 +0100 @@ -26,6 +26,7 @@ #include #include #include +#include //--------------------------------------------------------------// diff -Naur kmatplot-0.4/kmatplot/dialogs/kschannellist.cpp kmatplot-0.4mdk/kmatplot/dialogs/kschannellist.cpp --- kmatplot-0.4/kmatplot/dialogs/kschannellist.cpp 2002-01-25 00:38:20.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/dialogs/kschannellist.cpp 2002-12-16 18:54:43.000000000 +0100 @@ -22,7 +22,7 @@ //-------------------------------------------------------------// -KSChannelList::KSChannelList( QWidget *parent, const char *name = 0 ) +KSChannelList::KSChannelList( QWidget *parent, const char *name ) : QListView( parent, name ) { m_show_all_channels = true; diff -Naur kmatplot-0.4/kmatplot/dialogs/kspanel.cpp kmatplot-0.4mdk/kmatplot/dialogs/kspanel.cpp --- kmatplot-0.4/kmatplot/dialogs/kspanel.cpp 2002-02-15 21:15:33.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/dialogs/kspanel.cpp 2002-12-16 18:54:43.000000000 +0100 @@ -40,7 +40,7 @@ //-----------------------------------------------------// -KSPanelButton::KSPanelButton( QWidget *parent, KSWorkbook *workbook, ButtonCategory category, const QPixmap& icon, const QString& toolTip, QSData *dataObject = NULL ) +KSPanelButton::KSPanelButton( QWidget *parent, KSWorkbook *workbook, ButtonCategory category, const QPixmap& icon, const QString& toolTip, QSData *dataObject) :QPushButton( parent ) { m_category = category; diff -Naur kmatplot-0.4/kmatplot/dialogs/kstextedit.cpp kmatplot-0.4mdk/kmatplot/dialogs/kstextedit.cpp --- kmatplot-0.4/kmatplot/dialogs/kstextedit.cpp 2002-03-13 22:26:57.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/dialogs/kstextedit.cpp 2002-12-16 18:54:43.000000000 +0100 @@ -536,4 +536,7 @@ m_text_edit->setFamily("Symbol"); m_text_edit->insert(text); m_text_edit->setFamily(family); - } \ No newline at end of file + } + +//---------------------------------------------------------------------------// + diff -Naur kmatplot-0.4/kmatplot/ksglobalmatrixlist.h kmatplot-0.4mdk/kmatplot/ksglobalmatrixlist.h --- kmatplot-0.4/kmatplot/ksglobalmatrixlist.h 2002-01-24 00:20:31.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/ksglobalmatrixlist.h 2002-12-16 18:51:39.000000000 +0100 @@ -40,7 +40,7 @@ class KSSheet : public QSData { Q_OBJECT - friend KSMatrixWorksheetCellRange; + friend class KSMatrixWorksheetCellRange; public: /** * Column Type @@ -162,7 +162,7 @@ class KSSheetList : public QSData { Q_OBJECT - friend KSSheet; + friend class KSSheet; public: /** * Constructor diff -Naur kmatplot-0.4/kmatplot/ksmatrixascii.cpp kmatplot-0.4mdk/kmatplot/ksmatrixascii.cpp --- kmatplot-0.4/kmatplot/ksmatrixascii.cpp 2002-01-24 03:32:58.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/ksmatrixascii.cpp 2002-12-16 18:51:34.000000000 +0100 @@ -64,12 +64,12 @@ KSMatrix* KSMatrixASCII::load( QDataStream& is, const QString& matrixname ) { - auto_ptr m; + std::auto_ptr m; int untitled_nr = 0; while ( !is.atEnd() ) { int dataPos; - auto_ptr h(read_header(is,&dataPos)); + std::auto_ptr h(read_header(is,&dataPos)); QCString name = h->name(); if ( name.isEmpty() ) h->setName( name.sprintf("untitled_%d",untitled_nr++) ); if ( QString(name) == matrixname ) { is.device()->at(dataPos); m = h; break; } diff -Naur kmatplot-0.4/kmatplot/ksmatrixiohandler.h kmatplot-0.4mdk/kmatplot/ksmatrixiohandler.h --- kmatplot-0.4/kmatplot/ksmatrixiohandler.h 2001-12-28 22:32:26.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/ksmatrixiohandler.h 2002-12-16 18:51:39.000000000 +0100 @@ -26,7 +26,7 @@ #include #include #include -#include +#include /** * List of matrix headers. diff -Naur kmatplot-0.4/kmatplot/ksmatrixmat.cpp kmatplot-0.4mdk/kmatplot/ksmatrixmat.cpp --- kmatplot-0.4/kmatplot/ksmatrixmat.cpp 2002-01-24 03:18:44.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/ksmatrixmat.cpp 2002-12-16 18:51:34.000000000 +0100 @@ -69,14 +69,14 @@ KSMatrix *KSMatrixMAT::load( QDataStream& is, const QString& matrixname ) { - auto_ptr m; + std::auto_ptr m; bool swap; int esize; int dsize; while ( !is.atEnd() ) { // read header - auto_ptr h(read_header( is, &swap, &esize, &dsize )); + std::auto_ptr h(read_header( is, &swap, &esize, &dsize )); // Check whether we found matrix, we have been looking for. if ( h->name() == matrixname ) { m = h; break; } // skip bytes to the next header @@ -180,7 +180,7 @@ default: return NULL; } - auto_ptr result( KSMatrix::create(etype) ); + std::auto_ptr result( KSMatrix::create(etype) ); QCString name( header.namlen ); is.readRawBytes( name.data(), header.namlen ); result->setName( name ); diff -Naur kmatplot-0.4/kmatplot/ksworksheetdlg.cpp kmatplot-0.4mdk/kmatplot/ksworksheetdlg.cpp --- kmatplot-0.4/kmatplot/ksworksheetdlg.cpp 2002-01-27 02:02:08.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/ksworksheetdlg.cpp 2002-12-16 18:51:34.000000000 +0100 @@ -1332,4 +1332,4 @@ m_workbook->execute(new KSCmdSheetOrder(KSCmdSheetOrder::Lower,selected_sheet,m_workbook->sheets())); } } -*/ \ No newline at end of file +*/ diff -Naur kmatplot-0.4/kmatplot/ksworkspace.cpp kmatplot-0.4mdk/kmatplot/ksworkspace.cpp --- kmatplot-0.4/kmatplot/ksworkspace.cpp 2002-02-20 20:54:23.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/ksworkspace.cpp 2002-12-16 18:51:34.000000000 +0100 @@ -157,8 +157,7 @@ //--------------------------------------------------------------------------// - -KSWorkspaceWindow::KSWorkspaceWindow( KSWorkspace *workspace, const QString& caption, const QPixmap& icon, WFlags f=0 ) +KSWorkspaceWindow::KSWorkspaceWindow( KSWorkspace *workspace, const QString& caption, const QPixmap& icon, WFlags f ) :QWidget( workspace->workspace(), "workspace_window", f | WDestructiveClose ) { m_contents = NULL; diff -Naur kmatplot-0.4/kmatplot/ksworkspace.h kmatplot-0.4mdk/kmatplot/ksworkspace.h --- kmatplot-0.4/kmatplot/ksworkspace.h 2002-02-20 20:23:51.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/ksworkspace.h 2002-12-16 18:51:39.000000000 +0100 @@ -36,7 +36,7 @@ *@author kamil */ class KSWorkspace : public QWidget { - friend KSWorkspaceWindow; + friend class KSWorkspaceWindow; Q_OBJECT public: /** @@ -88,7 +88,7 @@ * MDI child window of KSWorkspace.. */ class KSWorkspaceWindow : public QWidget { - friend KSWorkspace; + friend class KSWorkspace; public: /** * Constructor. diff -Naur kmatplot-0.4/kmatplot/widgets/qsaxes.h kmatplot-0.4mdk/kmatplot/widgets/qsaxes.h --- kmatplot-0.4/kmatplot/widgets/qsaxes.h 2002-03-11 21:26:27.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qsaxes.h 2002-12-16 18:53:44.000000000 +0100 @@ -49,7 +49,7 @@ * first and use QSAxes::shadowObject() to get a pointer to this object. */ class QSCAxesShadow : public QSCGroup { - friend QSAxes; + friend class QSAxes; Q_OBJECT public: /** @@ -110,7 +110,7 @@ class QSAxes : public QSGraphicalData { Q_OBJECT - friend QSPlot; + friend class QSPlot; Q_PROPERTY( double xPosMM READ xPosMM WRITE setXPosMM ) Q_PROPERTY( double yPosMM READ yPosMM WRITE setYPosMM ) Q_PROPERTY( double widthMM READ widthMM WRITE setWidthMM ) diff -Naur kmatplot-0.4/kmatplot/widgets/qsaxis.h kmatplot-0.4mdk/kmatplot/widgets/qsaxis.h --- kmatplot-0.4/kmatplot/widgets/qsaxis.h 2002-03-13 22:00:27.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qsaxis.h 2002-12-16 18:53:44.000000000 +0100 @@ -84,7 +84,7 @@ class QSAxis : public QSAxesChild { Q_OBJECT - friend QSAxes; + friend class QSAxes; Q_PROPERTY( bool visible READ visible WRITE setVisible ) Q_PROPERTY( bool oppositePosition READ oppositePosition WRITE setOppositePosition ) Q_PROPERTY( bool defaultPosition READ defaultPosition WRITE setDefaultPosition ) diff -Naur kmatplot-0.4/kmatplot/widgets/qscobject.h kmatplot-0.4mdk/kmatplot/widgets/qscobject.h --- kmatplot-0.4/kmatplot/widgets/qscobject.h 2002-03-11 18:20:42.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qscobject.h 2002-12-16 18:53:44.000000000 +0100 @@ -249,8 +249,8 @@ * @author Kamil Dobkowski */ class QSCObject : public QObject, public QSSerializable { - friend QSCObjectCollection; - friend QSCGroup; + friend class QSCObjectCollection; + friend class QSCGroup; Q_OBJECT Q_PROPERTY( int defaultXAxis READ defaultXAxis WRITE setDefaultXAxis ) Q_PROPERTY( int defaultYAxis READ defaultYAxis WRITE setDefaultYAxis ) diff -Naur kmatplot-0.4/kmatplot/widgets/qsmatrix.cpp kmatplot-0.4mdk/kmatplot/widgets/qsmatrix.cpp --- kmatplot-0.4/kmatplot/widgets/qsmatrix.cpp 2002-01-24 00:23:57.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qsmatrix.cpp 2002-12-16 18:53:49.000000000 +0100 @@ -165,15 +165,4 @@ } row += rowStep; } - } - - - - - - - - - - - \ No newline at end of file +} diff -Naur kmatplot-0.4/kmatplot/widgets/qsplot.h kmatplot-0.4mdk/kmatplot/widgets/qsplot.h --- kmatplot-0.4/kmatplot/widgets/qsplot.h 2002-03-12 00:32:28.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qsplot.h 2002-12-16 18:53:44.000000000 +0100 @@ -46,7 +46,7 @@ class QSPlot : public QSAxesChild { Q_OBJECT - friend QSAxes; + friend class QSAxes; Q_PROPERTY( int defaultXAxis READ defaultXAxis WRITE setDefaultXAxis ) Q_PROPERTY( int defaultYAxis READ defaultYAxis WRITE setDefaultYAxis ) Q_PROPERTY( int defaultZAxis READ defaultZAxis WRITE setDefaultZAxis ) diff -Naur kmatplot-0.4/kmatplot/widgets/qsplotview.h kmatplot-0.4mdk/kmatplot/widgets/qsplotview.h --- kmatplot-0.4/kmatplot/widgets/qsplotview.h 2002-03-11 21:30:45.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qsplotview.h 2002-12-16 18:53:44.000000000 +0100 @@ -54,7 +54,7 @@ */ class QSSelection : public QSCObjectCollection { - friend QSPlotView; + friend class QSPlotView; Q_OBJECT public: /** diff -Naur kmatplot-0.4/kmatplot/widgets/qsprojection.cpp kmatplot-0.4mdk/kmatplot/widgets/qsprojection.cpp --- kmatplot-0.4/kmatplot/widgets/qsprojection.cpp 2002-02-22 02:17:16.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qsprojection.cpp 2002-12-16 18:53:49.000000000 +0100 @@ -606,7 +606,7 @@ //-------------------------------------------------------------// -QSProjection::ClipResult QSProjection::clipPoly2( const QSPt2f in[], int inpoints, QSPt2f out[], int *outpoints, int maxpoints, bool outedges[] = NULL, const bool inedges[] = NULL ) const +QSProjection::ClipResult QSProjection::clipPoly2( const QSPt2f in[], int inpoints, QSPt2f out[], int *outpoints, int maxpoints, bool outedges[], const bool inedges[]) const { static const double cmin_x = 0.0; static const double cmax_x = 1.0; @@ -826,7 +826,7 @@ //-------------------------------------------------------------// -QSProjection::ClipResult QSProjection::clipPoly3( const QSPt3f in[], int inpoints, QSPt3f out[], int *outpoints, int maxpoints, const QSPt3f c[2], bool outedges[] = NULL, const bool inedges[] = NULL ) const +QSProjection::ClipResult QSProjection::clipPoly3( const QSPt3f in[], int inpoints, QSPt3f out[], int *outpoints, int maxpoints, const QSPt3f c[2], bool outedges[], const bool inedges[] ) const { static const double cmin_x = 0.0; static const double cmax_x = 1.0; @@ -1022,4 +1022,4 @@ { return (1.0-p.z); } -*/ \ No newline at end of file +*/ diff -Naur kmatplot-0.4/kmatplot/widgets/qsserializable.cpp kmatplot-0.4mdk/kmatplot/widgets/qsserializable.cpp --- kmatplot-0.4/kmatplot/widgets/qsserializable.cpp 2001-10-18 23:46:40.000000000 +0200 +++ kmatplot-0.4mdk/kmatplot/widgets/qsserializable.cpp 2002-12-16 18:53:49.000000000 +0100 @@ -57,5 +57,5 @@ //---------------------------------------------------------------------------------------------------// void QSSerializable::saveStateToStream( QDataStream&, QSObjectFactory * ) - { - } \ No newline at end of file +{ +} diff -Naur kmatplot-0.4/kmatplot/widgets/qssurface.cpp kmatplot-0.4mdk/kmatplot/widgets/qssurface.cpp --- kmatplot-0.4/kmatplot/widgets/qssurface.cpp 2002-03-11 23:46:23.000000000 +0100 +++ kmatplot-0.4mdk/kmatplot/widgets/qssurface.cpp 2002-12-16 18:53:49.000000000 +0100 @@ -693,7 +693,7 @@ //-------------------------------------------------------------// -void QSSurface::draw_polygon( const QSPt3f pts[4], QSPt3f *norms, const double *values=NULL, const bool *edges=NULL ) +void QSSurface::draw_polygon( const QSPt3f pts[4], QSPt3f *norms, const double *values, const bool *edges ) { for( int i=0; i<4; i++ ) d->canvas_pts[i] = m_proj->world3DToCanvas3( pts[i] ); if ( !QSProjection::isCorrect(pts) || @@ -831,4 +831,4 @@ d->mesh_edges[1] = ((d->quarter.ci-1)%m_x_grid_step) == 0; d->mesh_edges[2] = ((d->quarter.cj)%m_y_grid_step) == 0; } - */ \ No newline at end of file +*/