diff -r 5cfbba1dc2f8 -r 9aadd0f58300 texteditor.h --- a/texteditor.h Wed Jun 14 10:28:01 2006 +0000 +++ b/texteditor.h Tue Aug 15 11:42:10 2006 +0000 @@ -1,13 +1,10 @@ -/* emacs: -*- Mode: C; c-style: "bsd"; c-basic-offset: 4; c-recognize-knr-p: nil; -*- */ #ifndef TEXTEDITOR_H #define TEXTEDITOR_H #include -#include -#include -#include -#include -//Added by qt3to4: +#include +#include +#include #include @@ -31,7 +28,7 @@ QString getFilename (); void setFilenameHint (const QString&); QString getFilenameHint (); - bool findText(const QString &, const bool &); // find Text + bool findText(const QString &, const QTextDocument::FindFlags &); // find Text protected: void setupFileActions(); @@ -81,6 +78,7 @@ void verticalAlignmentChanged(int a); void enableActions(); void disableActions(); + void setState (EditorState); private: QPrinter *printer; @@ -129,7 +127,7 @@ *actionAlignSuperScript; }; -/* Wraps currentVerticalAlignmentChanged(VerticalAlignment) +/* FIXME Wraps currentVerticalAlignmentChanged(VerticalAlignment) * to currentVerticalAlignmentChanged(int) * this way the signal can be used without use of the internal * VerticalAlignment enum of QTextEdit @@ -137,26 +135,31 @@ * have been no problems! */ -class MyTextEdit : public Q3TextEdit +class MyTextEdit : public QTextEdit { Q_OBJECT; public: - MyTextEdit(QWidget *parent, const char *name) : Q3TextEdit(parent, name) { - connect(this, - SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), - this, - SLOT(verticalAlignmentChanged(VerticalAlignment))); + MyTextEdit(QWidget *parent, const char *name) : QTextEdit(parent, name) + { + /* + connect( + this, SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), + this, SLOT(verticalAlignmentChanged(VerticalAlignment))); + */ } - int verticalAlignment() const { return m_verticalAlignment; } +// int verticalAlignment() const { return m_verticalAlignment; } signals: - void currentVerticalAlignmentChanged(int a); +// void currentVerticalAlignmentChanged(int a); public slots: - void verticalAlignmentChanged(VerticalAlignment a) { - m_verticalAlignment = a; - emit currentVerticalAlignmentChanged((int)a); + /* + void verticalAlignmentChanged(VerticalAlignment a) + { + m_verticalAlignment = a; + emit currentVerticalAlignmentChanged((int)a); } +*/ private: - int m_verticalAlignment; +// int m_verticalAlignment; }; #endif