remove QCodeEditor inspired by Giles Bathgates Jan 7 2012 email to list

setenv_mac-clang.sh

@@ -4,8 +4,7 @@ export QMAKESPEC=unsupported/macx-clang
 
 #export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
 #export CGALDIR=$PWD/../install/CGAL-3.6
-#export QCODEEDITDIR=$PWD/../qcodeedit-2.2.3/install
-#export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib:$QCODEEDITDIR/lib
+#export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib
 
 # ccache:
 export PATH=/opt/local/libexec/ccache:$PATH

setenv_mjau.sh

@@ -4,8 +4,7 @@ export QMAKESPEC=macx-g++
 
 #export OPENCSGDIR=$PWD/../OpenCSG-1.3.0
 #export CGALDIR=$PWD/../install/CGAL-3.6
-#export QCODEEDITDIR=$PWD/../qcodeedit-2.2.3/install
-#export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib:$QCODEEDITDIR/lib
+#export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib
 
 # ccache:
 export PATH=/opt/local/libexec/ccache:$PATH

src/editor.cc

@@ -1,7 +1,6 @@
 #include "editor.h"
 #include "Preferences.h"
 
-#ifndef _QCODE_EDIT_
 void Editor::indentSelection()
 {
 	QTextCursor cursor = textCursor();
@@ -109,4 +108,3 @@ void Editor::wheelEvent ( QWheelEvent * event )
 	}
 }
 
-#endif

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
 };

src/highlighter.cc

@@ -27,11 +27,7 @@
 #include "highlighter.h"
 #include "parsersettings.h" // extern int parser_error_pos;
 
-#ifdef _QCODE_EDIT_
-Highlighter::Highlighter(QDocument *parent)
-#else
 Highlighter::Highlighter(QTextDocument *parent)
-#endif
 		: QSyntaxHighlighter(parent)
 {
 }

src/highlighter.h

@@ -3,18 +3,10 @@
 
 #include <QSyntaxHighlighter>
 
-#ifdef _QCODE_EDIT_
-#include "qdocument.h"
-#endif
-
 class Highlighter : public QSyntaxHighlighter
 {
 public:
-#ifdef _QCODE_EDIT_
-	Highlighter(QDocument *parent);
-#else
 	Highlighter(QTextDocument *parent);
-#endif
 	void highlightBlock(const QString &text);
 };
 

src/mainwin.cc

@@ -70,11 +70,6 @@
 #include <QSettings>
 #include <QProgressDialog>
 #include <QMutexLocker>
-#ifdef _QCODE_EDIT_
-#include "qdocument.h"
-#include "qformatscheme.h"
-#include "qlanguagefactory.h"
-#endif
 
 #include <fstream>
 
@@ -186,15 +181,7 @@ MainWindow::MainWindow(const QString &filename)
 	fsteps = 1;
 
 	highlighter = NULL;
-#ifdef _QCODE_EDIT_
-	QFormatScheme *formats = new QFormatScheme("qxs/openscad.qxf");
-	QDocument::setDefaultFormatScheme(formats);
-	QLanguageFactory *languages = new QLanguageFactory(formats,this);
-	languages->addDefinitionPath("qxs");
-	languages->setLanguage(editor, "openscad");
-#else
 	editor->setTabStopWidth(30);
-#endif
 	editor->setLineWrapping(true); // Not designable
 
 	this->glview->statusLabel = new QLabel(this);
@@ -348,13 +335,8 @@ MainWindow::MainWindow(const QString &filename)
 	updateRecentFileActions();
 
 	connect(editor->document(), SIGNAL(contentsChanged()), this, SLOT(animateUpdateDocChanged()));
-#ifdef _QCODE_EDIT_
-	connect(editor, SIGNAL(contentModified(bool)), this, SLOT(setWindowModified(bool)));
-	connect(editor, SIGNAL(contentModified(bool)), fileActionSave, SLOT(setEnabled(bool)));
-#else
 	connect(editor->document(), SIGNAL(modificationChanged(bool)), this, SLOT(setWindowModified(bool)));
 	connect(editor->document(), SIGNAL(modificationChanged(bool)), fileActionSave, SLOT(setEnabled(bool)));
-#endif
 	connect(this->glview, SIGNAL(doAnimateUpdate()), this, SLOT(animateUpdate()));
 
 	connect(Preferences::inst(), SIGNAL(requestRedraw()), this->glview, SLOT(updateGL()));
@@ -483,12 +465,7 @@ void
 MainWindow::openFile(const QString &new_filename)
 {
 #ifdef ENABLE_MDI
-#ifdef _QCODE_EDIT_
-	if (this->editor->document()->lines() > 1 ||
-			!this->editor->document()->text(true, false).trimmed().isEmpty()) {
-#else
 	if (!editor->toPlainText().isEmpty()) {
-#endif
 		new MainWindow(new_filename);
 		clearCurrentOutput();
 		return;
@@ -957,11 +934,7 @@ void MainWindow::hideEditor()
 
 void MainWindow::pasteViewportTranslation()
 {
-#ifdef _QCODE_EDIT_
-	QDocumentCursor cursor = editor->cursor();
-#else
 	QTextCursor cursor = editor->textCursor();
-#endif
 	QString txt;
 	txt.sprintf("[ %.2f, %.2f, %.2f ]", -this->glview->object_trans_x, -this->glview->object_trans_y, -this->glview->object_trans_z);
 	cursor.insertText(txt);
@@ -969,11 +942,7 @@ void MainWindow::pasteViewportTranslation()
 
 void MainWindow::pasteViewportRotation()
 {
-#ifdef _QCODE_EDIT_
-	QDocumentCursor cursor = editor->cursor();
-#else
 	QTextCursor cursor = editor->textCursor();
-#endif
 	QString txt;
 	txt.sprintf("[ %.2f, %.2f, %.2f ]",
 		fmodf(360 - this->glview->object_rot_x + 90, 360), fmodf(360 - this->glview->object_rot_y, 360), fmodf(360 - this->glview->object_rot_z, 360));
@@ -1075,14 +1044,9 @@ bool MainWindow::compileTopLevelDocument(bool reload)
 			this->highlighter = new Highlighter(editor->document());
 
 			if (!animate_panel->isVisible()) {
-#ifdef _QCODE_EDIT_
-				QDocumentCursor cursor = editor->cursor();
-				cursor.setPosition(parser_error_pos);
-#else
 				QTextCursor cursor = editor->textCursor();
 				cursor.setPosition(parser_error_pos);
 				editor->setTextCursor(cursor);
-#endif
 			}
 		}
 	}