Commit 71762e6a authored by Peter Hedlund's avatar Peter Hedlund

EBN/Krazy and include fixes.

svn path=/trunk/KDE/kdeedu/kmplot/; revision=662603
parent c55712ae
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
* *
*/ */
#include "coordsconfigdialog.h"
#include <klocale.h> #include <klocale.h>
#include <klineedit.h> #include <klineedit.h>
#include <kmessagebox.h> #include <kmessagebox.h>
...@@ -30,7 +32,6 @@ ...@@ -30,7 +32,6 @@
#include "settings.h" #include "settings.h"
#include "xparser.h" #include "xparser.h"
#include "coordsconfigdialog.h"
#include "ui_editcoords.h" #include "ui_editcoords.h"
class EditCoords : public QWidget, public Ui::EditCoords class EditCoords : public QWidget, public Ui::EditCoords
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* *
*/ */
#include "equationedit.h"
#include "functioneditor.h" #include "functioneditor.h"
#include "equationedit.h"
#include "kgradientdialog.h" #include "kgradientdialog.h"
#include "kmplotio.h" #include "kmplotio.h"
#include "maindlg.h" #include "maindlg.h"
......
...@@ -22,9 +22,8 @@ ...@@ -22,9 +22,8 @@
* *
*/ */
#include "equationedit.h"
#include "initialconditionseditor.h" #include "initialconditionseditor.h"
#include "equationedit.h"
#include "parser.h" #include "parser.h"
#include <QHeaderView> #include <QHeaderView>
......
...@@ -23,9 +23,8 @@ ...@@ -23,9 +23,8 @@
* *
*/ */
#include "kmplotio.h"
#include "kconstanteditor.h" #include "kconstanteditor.h"
#include "kmplotio.h"
#include "view.h" #include "view.h"
#include "xparser.h" #include "xparser.h"
......
...@@ -56,7 +56,7 @@ class KGradientEditor : public QWidget ...@@ -56,7 +56,7 @@ class KGradientEditor : public QWidget
Q_PROPERTY( QGradient gradient READ gradient WRITE setGradient USER true ) Q_PROPERTY( QGradient gradient READ gradient WRITE setGradient USER true )
public: public:
KGradientEditor( QWidget * parent = 0 ); KGradientEditor( QWidget * parent );
~KGradientEditor(); ~KGradientEditor();
/** /**
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
* *
*/ */
#include "kmplotio.h"
// Qt includes // Qt includes
#include <qdom.h> #include <qdom.h>
#include <qfile.h> #include <qfile.h>
...@@ -39,7 +41,6 @@ ...@@ -39,7 +41,6 @@
#include <stdlib.h> #include <stdlib.h>
// local includes // local includes
#include "kmplotio.h"
#include "maindlg.h" #include "maindlg.h"
#include "settings.h" #include "settings.h"
#include "xparser.h" #include "xparser.h"
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
* *
*/ */
#include "kparametereditor.h"
#include <kdebug.h> #include <kdebug.h>
#include <kfiledialog.h> #include <kfiledialog.h>
...@@ -39,8 +40,6 @@ ...@@ -39,8 +40,6 @@
#include <QList> #include <QList>
#include <QListWidget> #include <QListWidget>
#include "kparametereditor.h"
#include <assert.h> #include <assert.h>
class ParameterValueList; class ParameterValueList;
...@@ -168,7 +167,7 @@ void KParameterEditor::next() ...@@ -168,7 +167,7 @@ void KParameterEditor::next()
void KParameterEditor::selectedConstantChanged( QListWidgetItem * current ) void KParameterEditor::selectedConstantChanged( QListWidgetItem * current )
{ {
m_mainWidget->cmdDelete->setEnabled( current != 0 ); m_mainWidget->cmdDelete->setEnabled( current != 0 );
m_mainWidget->value->setText( current ? current->text() : QString::null ); m_mainWidget->value->setText( current ? current->text() : QString() );
m_mainWidget->value->selectAll(); m_mainWidget->value->selectAll();
} }
......
...@@ -43,7 +43,7 @@ class KParameterEditor : public KDialog ...@@ -43,7 +43,7 @@ class KParameterEditor : public KDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
KParameterEditor( QList<Value> *, QWidget *parent = 0 ); KParameterEditor( QList<Value> *, QWidget *parent );
~KParameterEditor(); ~KParameterEditor();
public slots: public slots:
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
* *
*/ */
#include "kprinterdlg.h"
// Qt includes // Qt includes
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>
...@@ -34,7 +36,6 @@ ...@@ -34,7 +36,6 @@
// local includes // local includes
#include "equationedit.h" #include "equationedit.h"
#include "kprinterdlg.h"
#include "parser.h" #include "parser.h"
KPrinterDlg::KPrinterDlg( QWidget *parent ) KPrinterDlg::KPrinterDlg( QWidget *parent )
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include "maindlg.h"
// Qt includes // Qt includes
#include <QMainWindow> #include <QMainWindow>
#include <QPainter> #include <QPainter>
...@@ -53,6 +55,7 @@ ...@@ -53,6 +55,7 @@
#include <kicon.h> #include <kicon.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h>
// local includes // local includes
#include "calculator.h" #include "calculator.h"
...@@ -63,7 +66,6 @@ ...@@ -63,7 +66,6 @@
#include "xparser.h" #include "xparser.h"
#include "settings.h" #include "settings.h"
#include "maindlg.h"
#include "ui_settingspagecolor.h" #include "ui_settingspagecolor.h"
#include "ui_settingspagefonts.h" #include "ui_settingspagefonts.h"
#include "ui_settingspagegeneral.h" #include "ui_settingspagegeneral.h"
...@@ -795,10 +797,6 @@ CoordsConfigDialog * MainDlg::coordsDialog( ) ...@@ -795,10 +797,6 @@ CoordsConfigDialog * MainDlg::coordsDialog( )
// It's usually safe to leave the factory code alone.. with the // It's usually safe to leave the factory code alone.. with the
// notable exception of the KAboutData data // notable exception of the KAboutData data
#include <kaboutdata.h>
#include <klocale.h>
#include <ktoolinvocation.h>
#include <kglobal.h>
KComponentData *KmPlotPartFactory::s_instance = 0L; KComponentData *KmPlotPartFactory::s_instance = 0L;
KAboutData* KmPlotPartFactory::s_about = 0L; KAboutData* KmPlotPartFactory::s_about = 0L;
......
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "parameterswidget.h"
#include "function.h" #include "function.h"
#include "kparametereditor.h" #include "kparametereditor.h"
#include "parameterswidget.h"
#include "xparser.h" #include "xparser.h"
#include <klocale.h> #include <klocale.h>
...@@ -69,7 +70,7 @@ ParameterSettings ParametersWidget::parameterSettings() const ...@@ -69,7 +70,7 @@ ParameterSettings ParametersWidget::parameterSettings() const
void ParametersWidget::editParameterList() void ParametersWidget::editParameterList()
{ {
KParameterEditor * dlg = new KParameterEditor( & m_parameters ); KParameterEditor * dlg = new KParameterEditor( & m_parameters, this );
dlg->exec(); dlg->exec();
emit parameterListChanged(); emit parameterListChanged();
} }
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <QList> #include <QList>
#include "ui_parameterswidget.h" #include "ui_parameterswidget.h"
#include "function.h"
class EquationEdit; class EquationEdit;
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#include "plotstylewidget.h"
#include "function.h" #include "function.h"
#include "kgradientdialog.h" #include "kgradientdialog.h"
#include "plotstylewidget.h"
#include "ui_plotstylewidget.h" #include "ui_plotstylewidget.h"
#include <kcolorbutton.h> #include <kcolorbutton.h>
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
* *
*/ */
#include "function.h"
#include "vector.h" #include "vector.h"
#include "function.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
* *
*/ */
#include "view.h"
// Qt includes // Qt includes
#include <QAbstractTextDocumentLayout> #include <QAbstractTextDocumentLayout>
#include <qbitmap.h> #include <qbitmap.h>
...@@ -62,7 +64,6 @@ ...@@ -62,7 +64,6 @@
#include "ksliderwindow.h" #include "ksliderwindow.h"
#include "maindlg.h" #include "maindlg.h"
#include "parameteranimator.h" #include "parameteranimator.h"
#include "view.h"
#include "viewadaptor.h" #include "viewadaptor.h"
#include "xparser.h" #include "xparser.h"
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
// local includes // local includes
#include "xparser.h"
#include "parseradaptor.h" #include "parseradaptor.h"
#include "maindlg.h" #include "maindlg.h"
#include "xparser.h"
// KDE includes // KDE includes
#include <kglobal.h> #include <kglobal.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment