diff -r a40af6315ac6 -r 3a58c9ef4a18 texteditor.h
--- a/texteditor.h	Thu Sep 14 11:38:17 2006 +0000
+++ b/texteditor.h	Thu Sep 14 11:38:18 2006 +0000
@@ -56,8 +56,6 @@
     void textLoad();
     void textSaveAs();
     void textSave();
-	void textConvertPar();
-	void textJoinLines();
 	void textExportAsASCII();
     void textPrint();
 	void textEditUndo();
@@ -74,15 +72,16 @@
 	void textVAlign();
     void fontChanged( const QFont &f );
     void colorChanged( const QColor &c );
+	void formatChanged (const QTextCharFormat &f);
     void alignmentChanged( int a );
-    void verticalAlignmentChanged(int a);
+    void verticalAlignmentChanged(QTextCharFormat::VerticalAlignment);
 	void enableActions();
 	void disableActions();
 	void setState (EditorState);
 
 private:
     QPrinter *printer;
-    MyTextEdit *e;
+    QTextEdit *e;
 	QPoint lastPos;			// save last position of window
     QString filename;
     QString filenameHint;
@@ -95,9 +94,7 @@
 
 	QFont varFont;
 	QFont fixedFont;
-    QComboBox
-	*comboFont,
-	*comboSize;
+    QComboBox *comboFont, *comboSize;
 	
 	QAction *actionFileLoad,
 	*actionFileSave,
@@ -109,8 +106,6 @@
 	*actionEditCut,
 	*actionEditPaste,
 	*actionEditDeleteAll,
-	*actionEditConvertPar,
-	*actionEditJoinLines,
 	*actionFormatUseFixedFont,
 	*actionSettingsVarFont,
 	*actionSettingsFixedFont,
@@ -119,47 +114,12 @@
 	*actionTextUnderline,
 	*actionTextItalic,
 	*actionTextColor,
+	*actionAlignSubScript,
+	*actionAlignSuperScript,
 	*actionAlignLeft,
 	*actionAlignCenter,
 	*actionAlignRight,
-	*actionAlignJustify,
-	*actionAlignSubScript,
-	*actionAlignSuperScript;
-};
-
-/* FIXME Wraps currentVerticalAlignmentChanged(VerticalAlignment)
- * to currentVerticalAlignmentChanged(int) 
- * this way the signal can be used without use of the internal 
- * VerticalAlignment enum of QTextEdit 
- * If VerticalAlignment has been a global like the normal alignment there
- * have been no problems!
- */
- 
-class MyTextEdit : public QTextEdit 
-{
-    Q_OBJECT;
- public:
-    MyTextEdit(QWidget *parent, const char *name) : QTextEdit(parent, name) 
-	{
-	/*
-		connect(
-			this, SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), 
-			this, SLOT(verticalAlignmentChanged(VerticalAlignment)));
-	*/		
-    }
-//    int verticalAlignment() const { return m_verticalAlignment; } 
- signals:
-//    void currentVerticalAlignmentChanged(int a);
- public slots:
- /*
-    void verticalAlignmentChanged(VerticalAlignment a) 
-	{
-		m_verticalAlignment = a;
-		emit currentVerticalAlignmentChanged((int)a);
-    }
-*/	
- private: 
-//	 int m_verticalAlignment;
+	*actionAlignJustify;
 };
 
 #endif