Merge branch 'master' of github.com:openscad/openscad into issue159

1 files changed, 0 insertions, 16 deletions

diff --git a/src/editor.h b/src/editor.h
index bb338b0..09484f5 100644
--- a/src/editor.h
+++ b/src/editor.h
@@ -3,26 +3,11 @@
 #include <QWidget>
 #include <QWheelEvent>
 
-#ifdef _QCODE_EDIT_
-#include <qeditor.h>
-class Editor : public QEditor
-#else
 #include <QTextEdit>
 class Editor : public QTextEdit
-#endif
 {
 	Q_OBJECT
 public:
-#ifdef _QCODE_EDIT_
-	Editor(QWidget *parent) : QEditor(parent) {}
-	QString toPlainText() const { return text(); }
-	void setPlainText(const QString& text) { setText(text); }
-public slots:
-	//void zoomIn() { zoom(1); }
-	void zoomIn(int n = 1) { zoom(n); }
-	//void zoomOut() { zoom(-1); } 
-	void zoomOut(int n = 1) { zoom(-n); } 
-#else
 	Editor(QWidget *parent) : QTextEdit(parent) { setAcceptRichText(false); }
 public slots:
 	void zoomIn();
@@ -36,5 +21,4 @@ public slots:
 	void uncommentSelection();
 private:
 	void wheelEvent ( QWheelEvent * event );
-#endif
 };