1.1 --- a/texteditor.h Wed Jun 14 10:28:01 2006 +0000
1.2 +++ b/texteditor.h Wed Aug 30 12:16:25 2006 +0000
1.3 @@ -1,13 +1,10 @@
1.4 -/* emacs: -*- Mode: C; c-style: "bsd"; c-basic-offset: 4; c-recognize-knr-p: nil; -*- */
1.5 #ifndef TEXTEDITOR_H
1.6 #define TEXTEDITOR_H
1.7
1.8 #include <QtGui>
1.9 -#include <q3mainwindow.h>
1.10 -#include <q3textedit.h>
1.11 -#include <qfontdatabase.h>
1.12 -#include <qcombobox.h>
1.13 -//Added by qt3to4:
1.14 +#include <QTextEdit>
1.15 +#include <QFontDatabase>
1.16 +#include <QComboBox>
1.17 #include <QCloseEvent>
1.18
1.19
1.20 @@ -31,7 +28,7 @@
1.21 QString getFilename ();
1.22 void setFilenameHint (const QString&);
1.23 QString getFilenameHint ();
1.24 - bool findText(const QString &, const bool &); // find Text
1.25 + bool findText(const QString &, const QTextDocument::FindFlags &); // find Text
1.26
1.27 protected:
1.28 void setupFileActions();
1.29 @@ -81,6 +78,7 @@
1.30 void verticalAlignmentChanged(int a);
1.31 void enableActions();
1.32 void disableActions();
1.33 + void setState (EditorState);
1.34
1.35 private:
1.36 QPrinter *printer;
1.37 @@ -129,7 +127,7 @@
1.38 *actionAlignSuperScript;
1.39 };
1.40
1.41 -/* Wraps currentVerticalAlignmentChanged(VerticalAlignment)
1.42 +/* FIXME Wraps currentVerticalAlignmentChanged(VerticalAlignment)
1.43 * to currentVerticalAlignmentChanged(int)
1.44 * this way the signal can be used without use of the internal
1.45 * VerticalAlignment enum of QTextEdit
1.46 @@ -137,26 +135,31 @@
1.47 * have been no problems!
1.48 */
1.49
1.50 -class MyTextEdit : public Q3TextEdit
1.51 +class MyTextEdit : public QTextEdit
1.52 {
1.53 Q_OBJECT;
1.54 public:
1.55 - MyTextEdit(QWidget *parent, const char *name) : Q3TextEdit(parent, name) {
1.56 - connect(this,
1.57 - SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)),
1.58 - this,
1.59 - SLOT(verticalAlignmentChanged(VerticalAlignment)));
1.60 + MyTextEdit(QWidget *parent, const char *name) : QTextEdit(parent, name)
1.61 + {
1.62 + /*
1.63 + connect(
1.64 + this, SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)),
1.65 + this, SLOT(verticalAlignmentChanged(VerticalAlignment)));
1.66 + */
1.67 }
1.68 - int verticalAlignment() const { return m_verticalAlignment; }
1.69 +// int verticalAlignment() const { return m_verticalAlignment; }
1.70 signals:
1.71 - void currentVerticalAlignmentChanged(int a);
1.72 +// void currentVerticalAlignmentChanged(int a);
1.73 public slots:
1.74 - void verticalAlignmentChanged(VerticalAlignment a) {
1.75 - m_verticalAlignment = a;
1.76 - emit currentVerticalAlignmentChanged((int)a);
1.77 + /*
1.78 + void verticalAlignmentChanged(VerticalAlignment a)
1.79 + {
1.80 + m_verticalAlignment = a;
1.81 + emit currentVerticalAlignmentChanged((int)a);
1.82 }
1.83 +*/
1.84 private:
1.85 - int m_verticalAlignment;
1.86 +// int m_verticalAlignment;
1.87 };
1.88
1.89 #endif