sfos/eql5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix *.dll loading in Windows; small revisions;

Browse source
This commit is contained in:
polos 2016-11-28 12:57:44 +01:00
parent 5dd1236ce1
commit 97921574e0
20 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Qt_EQL/cpp/lib.h
View file

@ -3,7 +3,7 @@
#include <QtWidgets>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
Qt_EQL/cpp_calling_lisp/lib.h
View file

@ -3,7 +3,7 @@
#include <QtWidgets>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
Qt_EQL/trafficlight/lib.h
View file

@ -3,7 +3,7 @@
#include <QtGui>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
Qt_EQL_plugin/qt_plugin.h
View file

@ -3,7 +3,7 @@
#include <Qt>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.h
View file

@ -5,7 +5,7 @@
#include <QtWebKit>
#include <eql_fun.h>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.h
View file

@ -5,7 +5,7 @@
#include <QtWebKitWidgets>
#include <eql_fun.h>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
examples/M-modules/webkit/lib/webkit_bridge.h
View file

@ -5,7 +5,7 @@
#include <QtWebKitWidgets>
#include <eql_fun.h>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
examples/X-extras/calculator.lisp
View file

@ -218,7 +218,7 @@
(|animateClick| (qfind-child *main* (first buttons)) milliseconds)
(qsingle-shot (* 2 milliseconds) (lambda () (auto (rest buttons) milliseconds)))))
;;; example / eql calculator -a
;;; example / eql5 calculator -a
(defun qarg (argument)
(find argument (|arguments.QCoreApplication|) :test 'string=))

2
examples/X-extras/cpp-move-blocks/lib.h
View file

@ -3,7 +3,7 @@
#include <QtGui>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
examples/X-extras/cpp-qimage/lib.h
View file

@ -3,7 +3,7 @@
#include <QtGui>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

10
src/ecl_fun.cpp
View file

@ -621,7 +621,7 @@ static cl_object new_qt_object(void* pointer, uint unique, int id, bool finalize
STATIC_SYMBOL_PKG (s_new_qt_object, "NEW-QT-OBJECT", "EQL")
cl_object l_qt_object = cl_funcall(5,
s_new_qt_object,
ecl_make_unsigned_integer((void_star_int)pointer),
ecl_make_unsigned_integer((quintptr)pointer),
ecl_make_unsigned_integer(unique),
MAKE_FIXNUM(id),
finalize ? Ct : Cnil);
@ -1122,7 +1122,7 @@ static MetaArg toMetaArg(const QByteArray& sType, cl_object l_arg) {
else if(sType.endsWith('*')) {
if(sType.startsWith('Q') || sType.startsWith("const Q")) {
QtObject o = toQtObject(l_arg);
void_star_int l = (void_star_int)o.pointer;
quintptr l = (quintptr)o.pointer;
// cast from QObject to non QObject + multiple inheritance problem
// e.g. QGraphicsObject, which inherits both QObject and QGraphicsItem
int q = sType.indexOf('Q');
@ -1286,7 +1286,7 @@ cl_object to_lisp_arg(const MetaArg& arg) {
else if("const char*" == sType) {
l_ret = STRING_COPY(*(char**)p); }
else {
l_ret = ecl_make_unsigned_integer((void_star_int)*(void**)p); }}
l_ret = ecl_make_unsigned_integer((quintptr)*(void**)p); }}
else if(T_QFileInfo == n) l_ret = from_qfileinfo(*(QFileInfo*)p);
else if(T_QFileInfoList == n) l_ret = from_qfileinfolist(*(QFileInfoList*)p);
else if(T_QGradientStop == n) l_ret = from_qgradientstop(*(QGradientStop*)p);
@ -1892,7 +1892,7 @@ cl_object qinvoke_method2(cl_object l_obj, cl_object l_cast, cl_object l_name, c
int i = -1;
void* _this = 0;
if(this_arg) {
void_star_int l = (void_star_int)obj.pointer;
quintptr l = (quintptr)obj.pointer;
if(qobject_align) {
// cast from QObject to non QObject + multiple inheritance problem
l += sizeof(QObject); }
@ -2552,7 +2552,7 @@ cl_object qload_ui(cl_object l_ui) {
ui.append(".ui"); }
UiLoader loader;
QFile file(ui);
if(file.open(QFile::ReadOnly)) {
if(file.open(QIODevice::ReadOnly)) {
QWidget* w = loader.load(&file);
file.close();
if(w) {

6
src/ecl_fun.h
View file

@ -219,12 +219,6 @@ typedef QListIterator<MetaArg> MetaArgIterator;
typedef QList<QByteArray> StrList;
typedef QList<int> IntList;
#ifdef Q_PROCESSOR_X86_64
typedef qulonglong void_star_int;
#else
typedef qulong void_star_int;
#endif
class QByteArray;
class QObject;
class QEvent;

2
src/eql.cpp
View file

@ -146,7 +146,7 @@ void EQL::exec(QWidget* widget, const QString& lispFile, const QString& slimeHoo
eval("(in-package :eql)");
forms << QString("(set-home \"%1\")").arg(home())
<< QString("(defvar *qt-main* (qt-object %1 0 (qid \"%2\")))")
.arg((void_star_int)widget)
.arg((quintptr)widget)
.arg(QString(LObjects::vanillaQtSuperClassName(widget->metaObject())))
<< QString("(export '*qt-main*)")
<< QString("(in-package :eql-user)")

2
src/gen/help/_ini.h
View file

@ -3,7 +3,7 @@
#include <QtHelp>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
src/gen/my/_ini.h
View file

@ -6,7 +6,7 @@
// Q_DECLARE_METATYPE(Q...)
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
src/gen/network/_ini.h
View file

@ -7,7 +7,7 @@
Q_DECLARE_METATYPE(QNetworkCacheMetaData)
Q_DECLARE_METATYPE(QList<QNetworkProxy>)
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
src/gen/opengl/_ini.h
View file

@ -4,7 +4,7 @@
#include "../../ecl_fun.h"
#include <QtOpenGL>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
src/gen/sql/_ini.h
View file

@ -7,7 +7,7 @@
Q_DECLARE_METATYPE(QSqlIndex)
Q_DECLARE_METATYPE(QSqlRecord)
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
src/gen/svg/_ini.h
View file

@ -3,7 +3,7 @@
#include <QtSvg>
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT

2
src/gen/webkit/_ini.h
View file

@ -6,7 +6,7 @@
Q_DECLARE_METATYPE(QList<QWebPluginFactory::Plugin>)
#ifdef Q_WS_WIN
#ifdef Q_OS_WIN
#define LIB_EXPORT __declspec(dllexport)
#else
#define LIB_EXPORT