some revisions

Qt_EQL/auto-reload.lisp

@@ -13,7 +13,7 @@
 (setf *lib-reloaded* 'show-current-apropos)
 
 (defun show-current-apropos (variable plugin)
-  (qset (qapp) "quitOnLastWindowClosed" nil) 
+  (! "setQuitOnLastWindowClosed" "QGuiApplication" nil) 
   (let ((obj (symbol-value variable)))
     (assert (qt-object-p obj))
     (qmsg (with-output-to-string (*standard-output*)

examples/9-simple-lisp-editor/exe/local_server.pro

@@ -1,3 +1,4 @@
+QT          += widgets
 TEMPLATE     = app
 CONFIG      += no_keywords release
 CONFIG      += console

examples/9-simple-lisp-editor/exe/main.cpp

@@ -1,7 +1,7 @@
 #undef SLOT
 
 #include <ecl/ecl.h>
-#include <QCoreApplication>
+#include <QApplication>
 #include <QTextCodec>
 #include "eql.h"
 
@@ -18,7 +18,7 @@ int main(int argc, char** argv) {
 
     EQL::ini(argv);
 
-    QCoreApplication qapp(argc, argv);
+    QApplication qapp(argc, argv);
 
     QTextCodec* utf8 = QTextCodec::codecForName("UTF-8");
     QTextCodec::setCodecForLocale(utf8);

examples/9-simple-lisp-editor/local-server.lisp

@@ -66,7 +66,7 @@
         (ini-streams)
         (set-debugger-hook)
         (setf si::*tpl-print-current-hook* 'send-file-position)
-        (qset (qapp) "quitOnLastWindowClosed" nil)
+        (! "setQuitOnLastWindowClosed" "QGuiApplication" nil)
         (qconnect *server* "newConnection()" 'new-client-connection)
         (multiple-value-bind (eql-version qt-version)
             (qversion)
@@ -319,10 +319,4 @@
             (unless (zerop size)
               (values (read-from-string (qfrom-utf8 (apply 'concatenate 'vector (nreverse data))))))))))))
 
-#|
-(defun %log (str)
-  (with-open-file (out "/tmp/log.txt" :direction :output :if-does-not-exist :create :if-exists :append)
-    (format out "### ~A~%" (subseq str 0 (min (length str) 80)))))
-|#
-
 (ini)

src/eql.cpp

@@ -42,6 +42,7 @@ QString EQL::home() {
 /*
 void EQL::ignoreIOStreams() {
     // [Windows] print output would cause the executable to crash
+    // TODO
 }
 */
 

src/lisp/mark.lisp

@@ -1,6 +1,6 @@
 ;;; Mark error position (when loading a file in ECL)
 ;;;
-;;; example: eql mark file.lisp 5775 (will insert "#|TODO|#")
+;;; example: eql5 mark file.lisp 5775 (will insert "#|TODO|#")
 
 (let* ((args (|arguments.QCoreApplication|))
        (file (third args))