Index: .gitignore ================================================================== --- .gitignore +++ .gitignore @@ -1,4 +1,15 @@ +*.a +*.dylib +*.o +*.orig +*.so +*.so.* *~ -.qmake.stash -build -Makefile +.deps +aclocal.m4 +autom4te.cache +buildsys.mk +config.log +config.status +configure +extra.mk ADDED Makefile Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -0,0 +1,10 @@ +SUBDIRS = src +DISTCLEAN = aclocal.m4 \ + autom4te.cache \ + buildsys.mk \ + config.h \ + config.log \ + config.status \ + extra.mk + +include buildsys.mk DELETED ObjQt.pro Index: ObjQt.pro ================================================================== --- ObjQt.pro +++ ObjQt.pro @@ -1,55 +0,0 @@ -TEMPLATE = lib -TARGET = ObjQt -DESTDIR = build -OBJECTS_DIR = build -QT += core gui widgets - -INCLUDEPATH += common \ - QtCore \ - QtGui \ - QtWidgets - -HEADERS += common/helpers.h \ - common/OFDataArray+QByteArray.h \ - common/OFString+QString.h \ - common/QtOwnershipManaging.h \ - QtCore/QtChildEvent.h \ - QtCore/QtCoreApplication.h \ - QtCore/QtEvent.h \ - QtCore/QtObject.h \ - QtCore/QtThread.h \ - QtGui/QtGUIApplication.h \ - QtGui/QtPaintDevice.h \ - QtWidgets/QtAction.h \ - QtWidgets/QtApplication.h \ - QtWidgets/QtWidget.h - -SOURCES += common/OFDataArray+QByteArray.mm \ - common/OFString+QString.mm \ - QtCore/QtChildEvent.mm \ - QtCore/QtCoreApplication.mm \ - QtCore/QtEvent.mm \ - QtCore/QtObject.mm \ - QtCore/QtThread.mm \ - QtGui/QtGUIApplication.mm \ - QtGui/QtPaintDevice.mm \ - QtWidgets/QtAction.mm \ - QtWidgets/QtApplication.mm \ - QtWidgets/QtWidget.mm - -OBJCFLAGS += $$system("sh -c 'objfw-config --cppflags --objcflags --cxxflags'") -OBJCFLAGS_WARN_ON = -Wall \ - -Werror \ - -Wsemicolon-before-method-body \ - -Wobjc-missing-property-synthesis - -# qmake treats .mm files as C++ on Mac, but as C on everything else -macx:QMAKE_CXXFLAGS += $$OBJCFLAGS -macx:QMAKE_CXXFLAGS_WARN_ON = $$OBJCFLAGS_WARN_ON -!macx:QMAKE_CC = clang++ -!macx:QMAKE_CFLAGS += -std=c++11 $$OBJCFLAGS -!macx:QMAKE_CFLAGS_WARN_ON = $$OBJCFLAGS_WARN_ON -win32:QMAKE_CFLAGS -= -fno-keep-inline-dllexport -win32:QMAKE_CFLAGS_WARN_ON += -Wno-ignored-attributes - -LIBS += $$system("sh -c 'objfw-config --ldflags --libs'") DELETED QtCore/QtChildEvent.h Index: QtCore/QtChildEvent.h ================================================================== --- QtCore/QtChildEvent.h +++ QtCore/QtChildEvent.h @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtEvent.h" - -@class QtObject; - -@interface QtChildEvent: QtEvent -@property (readonly) QChildEvent *qChildEvent; -@property (readonly, getter=isAdded) bool added; -@property (readonly, retain) QtObject *child; -@property (readonly, getter=isPolished) bool polished; -@property (readonly, getter=isRemoved) bool removed; - -- initWithQChildEvent: (QChildEvent*)qChildEvent; -- initWithType: (QChildEvent::Type)type - child: (QtObject*)child; -@end - -namespace ObjQt { - -static OF_INLINE QtChildEvent* -toOF(QChildEvent *qChildEvent) -{ - return [[[QtChildEvent alloc] - initWithQChildEvent: qChildEvent] autorelease]; -} - -static OF_INLINE QChildEvent* -toQt(QtChildEvent *childEvent) -{ - return [childEvent qChildEvent]; -} - -} DELETED QtCore/QtChildEvent.mm Index: QtCore/QtChildEvent.mm ================================================================== --- QtCore/QtChildEvent.mm +++ QtCore/QtChildEvent.mm @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtChildEvent.h" -#import "QtObject.h" - -using ObjQt::toOF; -using ObjQt::toQt; - -@implementation QtChildEvent -- initWithQEvent: (QEvent*)event -{ - OF_INVALID_INIT_METHOD -} - -- initWithQChildEvent: (QChildEvent*)event -{ - return [super initWithQEvent: event]; -} - -- initWithType: (QChildEvent::Type)type - child: (QtObject*)child -{ - try { - self = [self initWithQChildEvent: - new QChildEvent(type, toQt(child))]; - - [self takeOwnership]; - - return self; - } catch (const std::bad_alloc &e) { - self = [super initWithQEvent: NULL]; - [self release]; - throw; - } -} - -- (QChildEvent*)qChildEvent -{ - return dynamic_cast(_qEvent); -} - -- (bool)isAdded -{ - return toQt(self)->added(); -} - -- (QtObject*)child -{ - return toOF(toQt(self)->child()); -} - -- (bool)isPolished -{ - return toQt(self)->polished(); -} - -- (bool)isRemoved -{ - return toQt(self)->removed(); -} -@end DELETED QtCore/QtCoreApplication.h Index: QtCore/QtCoreApplication.h ================================================================== --- QtCore/QtCoreApplication.h +++ QtCore/QtCoreApplication.h @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtObject.h" - -#include - -@interface QtCoreApplication: QtObject -@property (readonly) QCoreApplication *qCoreApplication; -@property (copy) OFString *applicationName, *applicationVersion; -@property (copy) OFString *organizationDomain, *organizationName; -@property (getter=isQuitLockEnabled) bool quitLockEnabled; - -- initWithQCoreApplication: (QCoreApplication*)qCoreApplication; -- (void)installNativeEventFilter: (QAbstractNativeEventFilter*)filterObject; -- (void)quit; -- (void)removeNativeEventFilter: (QAbstractNativeEventFilter*)filterObject; -- (bool)sendEvent: (QtEvent*)event - receiver: (QtObject*)receiver; -@end - -namespace ObjQt { - -static OF_INLINE QtCoreApplication* -toOF(QCoreApplication *qCoreApplication) -{ - return [[[QtCoreApplication alloc] - initWithQCoreApplication: qCoreApplication] autorelease]; -} - -static OF_INLINE QCoreApplication* -toQt(QtCoreApplication *coreApplication) -{ - return [coreApplication qCoreApplication]; -} - -} DELETED QtCore/QtCoreApplication.mm Index: QtCore/QtCoreApplication.mm ================================================================== --- QtCore/QtCoreApplication.mm +++ QtCore/QtCoreApplication.mm @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtCoreApplication.h" -#import "QtEvent.h" -#import "OFString+QString.h" - -using ObjQt::toOF; -using ObjQt::toQt; - -@implementation QtCoreApplication -- initWithQObject: (QObject*)qObject -{ - OF_INVALID_INIT_METHOD -} - -- initWithQCoreApplication: (QCoreApplication*)qCoreApplication -{ - return [super initWithQObject: qCoreApplication]; -} - -- (QCoreApplication*)qCoreApplication -{ - return qobject_cast(_qObject); -} - -- (OFString*)applicationName -{ - return toOF(toQt(self)->applicationName()); -} - -- (void)setApplicationName: (OFString*)applicationName -{ - toQt(self)->setApplicationName(toQt(applicationName)); -} - -- (OFString*)applicationVersion -{ - return toOF(toQt(self)->applicationVersion()); -} - -- (void)installNativeEventFilter: (QAbstractNativeEventFilter*)filterObject -{ - toQt(self)->installNativeEventFilter(filterObject); -} - -- (void)setApplicationVersion: (OFString*)applicationVersion -{ - toQt(self)->setApplicationVersion(toQt(applicationVersion)); -} - -- (OFString*)organizationDomain -{ - return toOF(toQt(self)->organizationDomain()); -} - -- (void)setOrganizationDomain: (OFString*)organizationDomain -{ - toQt(self)->setOrganizationDomain(toQt(organizationDomain)); -} - -- (OFString*)organizationName -{ - return toOF(toQt(self)->organizationName()); -} - -- (void)setOrganizationName: (OFString*)organizationName -{ - toQt(self)->setOrganizationName(toQt(organizationName)); -} - -- (void)quit -{ - toQt(self)->quit(); -} - -- (bool)isQuitLockEnabled -{ - return toQt(self)->isQuitLockEnabled(); -} - -- (void)setQuitLockEnabled: (bool)quitLockEnabled -{ - toQt(self)->setQuitLockEnabled(quitLockEnabled); -} - -- (void)removeNativeEventFilter: (QAbstractNativeEventFilter*)filterObject -{ - toQt(self)->removeNativeEventFilter(filterObject); -} - -- (bool)sendEvent: (QtEvent*)event - receiver: (QtObject*)receiver -{ - return toQt(self)->notify(toQt(receiver), toQt(event)); -} -@end DELETED QtCore/QtEvent.h Index: QtCore/QtEvent.h ================================================================== --- QtCore/QtEvent.h +++ QtCore/QtEvent.h @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#import "QtOwnershipManaging.h" - -#include - -@interface QtEvent: OFObject -{ - QEvent *_qEvent; - bool _ownsEvent; -} - -@property (readonly) QEvent *qEvent; -@property (getter=isAccepted) bool accepted; -@property (readonly, getter=isSpontaneous) bool spontaneous; -@property (readonly) QEvent::Type type; - -+ (int)registerEventType: (int)hint; -- initWithQEvent: (QEvent*)qEvent; -- (void)accept; -- (void)ignore; -@end - -namespace ObjQt { - -static OF_INLINE QtEvent* -toOF(QEvent *qEvent) -{ - return [[[QtEvent alloc] initWithQEvent: qEvent] autorelease]; -} - -static OF_INLINE QEvent* -toQt(QtEvent *event) -{ - return [event qEvent]; -} - -} DELETED QtCore/QtEvent.mm Index: QtCore/QtEvent.mm ================================================================== --- QtCore/QtEvent.mm +++ QtCore/QtEvent.mm @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtEvent.h" - -@implementation QtEvent -@synthesize qEvent = _qEvent; - -+ (int)registerEventType: (int)hint -{ - return QEvent::registerEventType(hint); -} - -- init -{ - OF_INVALID_INIT_METHOD -} - -- initWithQEvent: (QEvent*)qEvent -{ - self = [super init]; - - _qEvent = qEvent; - - return self; -} - -- (void)dealloc -{ - if (_ownsEvent) - delete _qEvent; - - [super dealloc]; -} - -- (void)takeOwnership -{ - OF_ENSURE(!_ownsEvent); - _ownsEvent = true; -} - -- (void)giveUpOwnership -{ - OF_ENSURE(_ownsEvent); - _ownsEvent = false; -} - -- (void)accept -{ - _qEvent->accept(); -} - -- (void)ignore -{ - _qEvent->ignore(); -} - -- (bool)isAccepted -{ - return _qEvent->isAccepted(); -} - -- (void)setAccepted: (bool)accepted -{ - _qEvent->setAccepted(accepted); -} - -- (bool)isSpontaneous -{ - return _qEvent->spontaneous(); -} - -- (QEvent::Type)type -{ - return _qEvent->type(); -} -@end DELETED QtCore/QtObject.h Index: QtCore/QtObject.h ================================================================== --- QtCore/QtObject.h +++ QtCore/QtObject.h @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#import "QtOwnershipManaging.h" - -#include - -@class QtEvent; -@class QtThread; - -@interface QtObject: OFObject -{ - QObject *_qObject; - bool _ownsObject; -} - -@property (readonly) QObject *qObject; -@property (readonly) const QMetaObject *metaObject; -@property (retain) QtObject *parent; -@property (copy) OFString *objectName; - -- initWithQObject: (QObject*)qObject; -- (bool)setBlockSignals: (bool)block; -- (OFArray OF_GENERIC(QtObject*)*)children; -- (QMetaObject::Connection)connectSignal: (OFString*)signal - sender: (QtObject*)sender - method: (OFString*)method - type: (Qt::ConnectionType)type; -- (bool)disconnectSignal: (OFString*)signal - receiver: (QtObject*)receiver - method: (OFString*)method; -- (bool)disconnectAllSignalsForReceiver: (QtObject*)receiver - method: (OFString*)method; -- (void)dumpObjectInfo; -- (void)dumpObjectTree; -- (OFArray OF_GENERIC(OFDataArray*)*)dynamicPropertyNames; -- (bool)handleEvent: (QtEvent*)event; -- (bool)filterEvent: (QtEvent*)event - forObject: (QtObject*)watched; -// MISSING: T findChild(const QString &name = QString(), -// Qt::FindChildOptions options = Qt::FindChildrenRecursively) const; -// MISSING QList findChildren(const QString &name = QString(), -// Qt::FindChildOptions options = Qt::FindChildrenRecursively) const; -// MISSING: QList findChildren(const QRegExp ®Exp, -// Qt::FindChildOptions options = Qt::FindChildrenRecursively) const; -- (bool)inheritsClassWithName: (OFString*)className; -- (void)installEventFilter: (QtObject*)filterObj; -- (bool)isWidgetType; -- (bool)isWindowType; -- (void)killTimerWithID: (int)ID; -- (void)moveToThread: (QtThread*)targetThread; -- (QVariant)propertyForName: (OFString*)name; -- (void)removeEventFilter: (QtObject*)obj; -- (bool)setProperty: (QVariant&)value - forName: (OFString*)name; -- (bool)signalsBlocked; -- (int)startTimerWithInterval: (int)interval - type: (Qt::TimerType)type; -- (QtThread*)thread; -- (void)deleteLater; -@end - -namespace ObjQt { - -static OF_INLINE QtObject* -toOF(QObject *qObject) -{ - return [[[QtObject alloc] initWithQObject: qObject] autorelease]; -} - -static OF_INLINE QObject* -toQt(QtObject *object) -{ - return [object qObject]; -} - -} DELETED QtCore/QtObject.mm Index: QtCore/QtObject.mm ================================================================== --- QtCore/QtObject.mm +++ QtCore/QtObject.mm @@ -1,247 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtObject.h" -#import "QtEvent.h" -#import "QtThread.h" -#import "OFString+QString.h" -#import "OFDataArray+QByteArray.h" - -#include - -using ObjQt::toOF; -using ObjQt::toQt; - -@implementation QtObject -@synthesize qObject = _qObject; - -- init -{ - OF_INVALID_INIT_METHOD -} - -- initWithQObject: (QObject*)qObject -{ - self = [super init]; - - _qObject = qObject; - - return self; -} - -- (void)dealloc -{ - if (_ownsObject) - delete _qObject; - - [super dealloc]; -} - -- (void)takeOwnership -{ - OF_ENSURE(!_ownsObject); - _ownsObject = true; -} - -- (void)giveUpOwnership -{ - OF_ENSURE(_ownsObject); - _ownsObject = false; -} - -- (OFString*)objectName -{ - return toOF(_qObject->objectName()); -} - -- (void)setObjectName: (OFString*)objectName -{ - _qObject->setObjectName(toQt(objectName)); -} - -- (bool)setBlockSignals: (bool)block -{ - return _qObject->blockSignals(block); -} - -- (OFArray OF_GENERIC(QtObject*)*)children -{ - const QObjectList &qChildren = _qObject->children(); - OFMutableArray *children = [OFMutableArray arrayWithCapacity: - qChildren.count()]; - void *pool = objc_autoreleasePoolPush(); - - for (QObject *qChild: qChildren) - [children addObject: toOF(qChild)]; - - [children makeImmutable]; - - objc_autoreleasePoolPop(pool); - - return children; -} - -- (QMetaObject::Connection)connectSignal: (OFString*)signal - sender: (QtObject*)sender - method: (OFString*)method - type: (Qt::ConnectionType)type -{ - return _qObject->connect(toQt(sender), - [signal UTF8String], [method UTF8String], type); -} - -- (bool)disconnectSignal: (OFString*)signal - receiver: (QtObject*)receiver - method: (OFString*)method -{ - return _qObject->disconnect([signal UTF8String], toQt(receiver), - [method UTF8String]); -} - -- (bool)disconnectAllSignalsForReceiver: (QtObject*)receiver - method: (OFString*)method -{ - return _qObject->disconnect(toQt(receiver), [method UTF8String]); -} - -- (void)dumpObjectInfo -{ - _qObject->dumpObjectInfo(); -} - -- (void)dumpObjectTree -{ - _qObject->dumpObjectTree(); -} - -- (OFArray OF_GENERIC(OFDataArray*)*)dynamicPropertyNames -{ - const QList &dynamicPropertyNames = - _qObject->dynamicPropertyNames(); - OFMutableArray *ret = - [OFMutableArray arrayWithCapacity: dynamicPropertyNames.count()]; - void *pool = objc_autoreleasePoolPush(); - - for (const QByteArray &dynamicPropertyName: dynamicPropertyNames) - [ret addObject: toOF(dynamicPropertyName)]; - - [ret makeImmutable]; - - objc_autoreleasePoolPop(pool); - - return ret; -} - -- (bool)handleEvent: (QtEvent*)event -{ - return _qObject->event(toQt(event)); -} - -- (bool)filterEvent: (QtEvent*)event - forObject: (QtObject*)watched -{ - return _qObject->eventFilter(toQt(watched), toQt(event)); -} - -- (bool)inheritsClassWithName: (OFString*)className -{ - return _qObject->inherits([className UTF8String]); -} - -- (void)installEventFilter: (QtObject*)filterObj -{ - _qObject->installEventFilter(toQt(filterObj)); -} - -- (bool)isWidgetType -{ - return _qObject->isWidgetType(); -} - -- (bool)isWindowType -{ - return _qObject->isWindowType(); -} - -- (void)killTimerWithID: (int)ID -{ - _qObject->killTimer(ID); -} - -- (const QMetaObject*)metaObject -{ - return _qObject->metaObject(); -} - -- (void)moveToThread: (QtThread*)targetThread -{ - _qObject->moveToThread(toQt(targetThread)); -} - -- (QtObject*)parent -{ - return toOF(_qObject->parent()); -} - -- (void)setParent: (QtObject*)parent -{ - _qObject->setParent(toQt(parent)); -} - -- (QVariant)propertyForName: (OFString*)name -{ - return _qObject->property([name UTF8String]); -} - -- (void)removeEventFilter: (QtObject*)obj -{ - _qObject->removeEventFilter(toQt(obj)); -} - -- (bool)setProperty: (QVariant&)value - forName: (OFString*)name -{ - return _qObject->setProperty([name UTF8String], value); -} - -- (bool)signalsBlocked -{ - return _qObject->signalsBlocked(); -} - -- (int)startTimerWithInterval: (int)interval - type: (Qt::TimerType)type -{ - return _qObject->startTimer(interval, type); -} - -- (QtThread*)thread -{ - return toOF(_qObject->thread()); -} - -- (void)deleteLater -{ - OF_ENSURE(!_ownsObject); - _qObject->deleteLater(); -} -@end DELETED QtCore/QtThread.h Index: QtCore/QtThread.h ================================================================== --- QtCore/QtThread.h +++ QtCore/QtThread.h @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtObject.h" - -#include - -@interface QtThread: QtObject -@property (readonly) QThread *qThread; -@property QAbstractEventDispatcher *eventDispatcher; -@property (readonly, getter=isFinished) bool finished; -@property (readonly, getter=isInterruptionRequested) bool interruptionRequested; -@property (readonly, getter=isRunning) bool running; -@property (readonly) int loopLevel; -@property QThread::Priority priority; -@property unsigned int stackSize; - -- initWithQThread: (QThread*)qThread; -- (void)exitWithReturnCode: (int)returnCode; -- (void)requestInterruption; -- (bool)waitForMilliseconds: (unsigned long)time; -- (void)quit; -- (void)startWithPriority: (QThread::Priority)priority; -- (void)terminate; -@end - -namespace ObjQt { - -static OF_INLINE QtThread* -toOF(QThread *qThread) -{ - return [[[QtThread alloc] initWithQThread: qThread] autorelease]; -} - -static OF_INLINE QThread* -toQt(QtThread *thread) -{ - return [thread qThread]; -} - -} DELETED QtCore/QtThread.mm Index: QtCore/QtThread.mm ================================================================== --- QtCore/QtThread.mm +++ QtCore/QtThread.mm @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtThread.h" - -using ObjQt::toQt; - -@implementation QtThread: QtObject -- initWithQObject: (QObject*)qObject -{ - OF_INVALID_INIT_METHOD -} - -- initWithQThread: (QThread*)qThread -{ - return [super initWithQObject: qThread]; -} - -- (QThread*)qThread -{ - return qobject_cast(_qObject); -} - -- (QAbstractEventDispatcher*)eventDispatcher -{ - return toQt(self)->eventDispatcher(); -} - -- (void)setEventDispatcher: (QAbstractEventDispatcher*)eventDispatcher -{ - toQt(self)->setEventDispatcher(eventDispatcher); -} - -- (void)exitWithReturnCode: (int)returnCode -{ - toQt(self)->exit(returnCode); -} - -- (bool)isFinished -{ - return toQt(self)->isFinished(); -} - -- (bool)isInterruptionRequested -{ - return toQt(self)->isInterruptionRequested(); -} - -- (bool)isRunning -{ - return toQt(self)->isRunning(); -} - -- (int)loopLevel -{ - return toQt(self)->loopLevel(); -} - -- (QThread::Priority)priority -{ - return toQt(self)->priority(); -} - -- (void)setPriority: (QThread::Priority)priority -{ - toQt(self)->setPriority(priority); -} - -- (void)requestInterruption -{ - toQt(self)->requestInterruption(); -} - -- (unsigned int)stackSize -{ - return toQt(self)->stackSize(); -} - -- (void)setStackSize: (unsigned int)stackSize -{ - toQt(self)->setStackSize(stackSize); -} - -- (bool)waitForMilliseconds: (unsigned long)time -{ - return toQt(self)->wait(time); -} - -- (void)quit -{ - toQt(self)->quit(); -} - -- (void)startWithPriority: (QThread::Priority)priority -{ - toQt(self)->start(priority); -} - -- (void)terminate -{ - toQt(self)->terminate(); -} -@end DELETED QtGui/QtGUIApplication.h Index: QtGui/QtGUIApplication.h ================================================================== --- QtGui/QtGUIApplication.h +++ QtGui/QtGUIApplication.h @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtCoreApplication.h" - -#include - -@interface QtGUIApplication: QtCoreApplication -@property (readonly) QGuiApplication *qGuiApplication; -@property (copy) OFString *applicationDisplayName; -@property (copy) OFString *desktopFileName; -@property Qt::LayoutDirection layoutDirection; -@property (readonly, copy) OFString *platformName; -@property (readonly) QScreen *primaryScreen; -@property bool quitsOnLastWindowClosed; -@property QIcon windowIcon; - -- initWithQGuiApplication: (QGuiApplication*)qGuiApplication; -- (double)devicePixelRatio; -- (bool)isSavingSession; -- (bool)isSessionRestored; -- (OFString*)sessionID; -- (OFString*)sessionKey; -@end - -namespace ObjQt { - -static OF_INLINE QtGUIApplication* -toOF(QGuiApplication *qGuiApplication) -{ - return [[[QtGUIApplication alloc] - initWithQGuiApplication: qGuiApplication] autorelease]; -} - -static OF_INLINE QGuiApplication* -toQt(QtGUIApplication *GUIApplication) -{ - return [GUIApplication qGuiApplication]; -} - -} DELETED QtGui/QtGUIApplication.mm Index: QtGui/QtGUIApplication.mm ================================================================== --- QtGui/QtGUIApplication.mm +++ QtGui/QtGUIApplication.mm @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtGUIApplication.h" -#import "OFString+QString.h" - -#include - -using ObjQt::toOF; -using ObjQt::toQt; - -@implementation QtGUIApplication -- initWithQCoreApplication: (QCoreApplication*)qCoreApplication -{ - OF_INVALID_INIT_METHOD -} - -- initWithQGuiApplication: (QGuiApplication*)qGuiApplication -{ - return [super initWithQCoreApplication: qGuiApplication]; -} - -- (QGuiApplication*)qGuiApplication -{ - return qobject_cast(_qObject); -} - -- (OFString*)applicationDisplayName -{ - return toOF(toQt(self)->applicationDisplayName()); -} - -- (void)setApplicationDisplayName: (OFString*)applicationDisplayName -{ - toQt(self)->setApplicationDisplayName(toQt(applicationDisplayName)); -} - -- (OFString*)desktopFileName -{ - return toOF(toQt(self)->desktopFileName()); -} - -- (void)setDesktopFileName: (OFString*)desktopFileName -{ - toQt(self)->setDesktopFileName(toQt(desktopFileName)); -} - -- (double)devicePixelRatio -{ - return toQt(self)->devicePixelRatio(); -} - -- (bool)isSavingSession -{ - return toQt(self)->isSavingSession(); -} - -- (bool)isSessionRestored -{ - return toQt(self)->isSessionRestored(); -} - -- (Qt::LayoutDirection)layoutDirection -{ - return toQt(self)->layoutDirection(); -} - -- (void)setLayoutDirection: (Qt::LayoutDirection)layoutDirection -{ - toQt(self)->setLayoutDirection(layoutDirection); -} - -- (OFString*)platformName -{ - return toOF(toQt(self)->platformName()); -} - -- (QScreen*)primaryScreen -{ - return toQt(self)->primaryScreen(); -} - -- (bool)quitsOnLastWindowClosed -{ - return toQt(self)->quitOnLastWindowClosed(); -} - -- (void)setQuitsOnLastWindowClosed: (bool)quitsOnLastWindowClosed -{ - toQt(self)->setQuitOnLastWindowClosed(quitsOnLastWindowClosed); -} - -- (OFString*)sessionID -{ - return toOF(toQt(self)->sessionId()); -} - -- (OFString*)sessionKey -{ - return toOF(toQt(self)->sessionKey()); -} - -- (QIcon)windowIcon -{ - return toQt(self)->windowIcon(); -} - -- (void)setWindowIcon: (QIcon)windowIcon -{ - toQt(self)->setWindowIcon(windowIcon); -} -@end DELETED QtGui/QtPaintDevice.h Index: QtGui/QtPaintDevice.h ================================================================== --- QtGui/QtPaintDevice.h +++ QtGui/QtPaintDevice.h @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#include - -@protocol QtPaintDevice -- (QPaintDevice*)qPaintDevice; -- (int)colorCount; -- (int)depth; -- (int)devicePixelRatio; -- (double)devicePixelRatioF; -- (int)height; -- (int)heightMM; -- (int)logicalDPIX; -- (int)logicalDPIY; -- (QPaintEngine*)paintEngine; -- (bool)paintingActive; -- (int)physicalDPIX; -- (int)physicalDPIY; -- (int)width; -- (int)widthMM; -@end - -@interface QtPaintDevice: OFObject -@property (readonly) QObject *qObject; -@end - -namespace ObjQt { - -static OF_INLINE QPaintDevice* -toQt(QtPaintDevice *paintDevice) -{ - return [paintDevice qPaintDevice]; -} - -} DELETED QtGui/QtPaintDevice.mm Index: QtGui/QtPaintDevice.mm ================================================================== --- QtGui/QtPaintDevice.mm +++ QtGui/QtPaintDevice.mm @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtPaintDevice.h" - -#include - -using ObjQt::toQt; - -@implementation QtPaintDevice -@dynamic qObject; - -- (QPaintDevice*)qPaintDevice -{ - return dynamic_cast([self qObject]); -} - -- (int)colorCount -{ - return toQt(self)->colorCount(); -} - -- (int)depth -{ - return toQt(self)->depth(); -} - -- (int)devicePixelRatio -{ - return toQt(self)->devicePixelRatio(); -} - -- (double)devicePixelRatioF -{ - return toQt(self)->devicePixelRatioF(); -} - -- (int)height -{ - return toQt(self)->height(); -} - -- (int)heightMM -{ - return toQt(self)->heightMM(); -} - -- (int)logicalDPIX -{ - return toQt(self)->logicalDpiX(); -} - -- (int)logicalDPIY -{ - return toQt(self)->logicalDpiY(); -} - -- (QPaintEngine*)paintEngine -{ - return toQt(self)->paintEngine(); -} - -- (bool)paintingActive -{ - return toQt(self)->paintingActive(); -} - -- (int)physicalDPIX -{ - return toQt(self)->physicalDpiX(); -} - -- (int)physicalDPIY -{ - return toQt(self)->physicalDpiY(); -} - -- (int)width -{ - return toQt(self)->width(); -} - -- (int)widthMM -{ - return toQt(self)->widthMM(); -} -@end DELETED QtWidgets/QtAction.h Index: QtWidgets/QtAction.h ================================================================== --- QtWidgets/QtAction.h +++ QtWidgets/QtAction.h @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtObject.h" - -#include - -@class QtWidget; - -@interface QtAction: QtObject -@property (readonly) QAction *qAction; -@property bool autoRepeat; -@property (getter=isCheckable) bool checkable; -@property (getter=isChecked) bool checked; -@property (getter=isEnabled) bool enabled; -@property QFont font; -@property QIcon icon; -@property (copy) OFString *iconText; -@property (getter=isIconVisibleInMenu) bool iconVisibleInMenu; -@property QAction::MenuRole menuRole; -@property QAction::Priority priority; -@property QKeySequence shortcut; -@property Qt::ShortcutContext shortcutContext; -@property (copy) OFString *statusTip; -@property (copy) OFString *text; -@property (copy) OFString *toolTip; -@property (getter=isVisible) bool visible; -@property (copy) OFString *whatsThis; - -- initWithQAction: (QAction*)qAction; -- (QActionGroup*)actionGroup; -- (void)activate: (QAction::ActionEvent)event; -- (QList)associatedGraphicsWidgets; -- (OFArray OF_GENERIC(QtWidget*)*)associatedWidgets; -- (QVariant)data; -- (bool)isSeparator; -- (QMenu*)menu; -- (QtWidget*)parentWidget; -- (void)setActionGroup: (QActionGroup*)group; -- (void)setData: (const QVariant&)data; -- (void)setMenu: (QMenu*)menu; -- (void)setSeparator: (bool)isSeparator; -- (void)setShortcuts: (const QList&)shortcuts; -- (void)setShortcutsWithStandardKey: (QKeySequence::StandardKey)key; -- (QList)shortcuts; -- (bool)showStatusText: (QtWidget*)widget; -@end - -namespace ObjQt { - -static OF_INLINE QtAction* -toOF(QAction *qAction) -{ - return [[[QtAction alloc] initWithQAction: qAction] autorelease]; -} - -static OF_INLINE QAction* -toQt(QtAction *action) -{ - return [action qAction]; -} - -} DELETED QtWidgets/QtAction.mm Index: QtWidgets/QtAction.mm ================================================================== --- QtWidgets/QtAction.mm +++ QtWidgets/QtAction.mm @@ -1,307 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtAction.h" -#import "QtWidget.h" -#import "OFString+QString.h" - -using ObjQt::toOF; -using ObjQt::toQt; - -@implementation QtAction -- initWithQObject: (QObject*)qObject -{ - OF_INVALID_INIT_METHOD -} - -- initWithQAction: (QAction*)qAction -{ - return [super initWithQObject: qAction]; -} - -- (QAction*)qAction -{ - return qobject_cast(_qObject); -} - -- (bool)autoRepeat -{ - return toQt(self)->autoRepeat(); -} - -- (void)setAutoRepeat: (bool)autoRepeat -{ - toQt(self)->setAutoRepeat(autoRepeat); -} - -- (bool)isCheckable -{ - return toQt(self)->isCheckable(); -} - -- (void)setCheckable: (bool)checkable -{ - toQt(self)->setCheckable(checkable); -} - -- (bool)isChecked -{ - return toQt(self)->isChecked(); -} - -- (void)setChecked: (bool)checked -{ - toQt(self)->setChecked(checked); -} - -- (bool)isEnabled -{ - return toQt(self)->isEnabled(); -} - -- (void)setEnabled: (bool)enabled -{ - toQt(self)->setEnabled(enabled); -} - -- (QFont)font -{ - return toQt(self)->font(); -} - -- (void)setFont: (QFont)font -{ - toQt(self)->setFont(font); -} - -- (QIcon)icon -{ - return toQt(self)->icon(); -} - -- (void)setIcon: (QIcon)icon -{ - toQt(self)->setIcon(icon); -} - -- (OFString*)iconText -{ - return toOF(toQt(self)->iconText()); -} - -- (void)setIconText: (OFString*)iconText -{ - toQt(self)->setIconText(toQt(iconText)); -} - -- (bool)isIconVisibleInMenu -{ - return toQt(self)->isIconVisibleInMenu(); -} - -- (void)setIconVisibleInMenu: (bool)iconVisibleInMenu -{ - toQt(self)->setIconVisibleInMenu(iconVisibleInMenu); -} - -- (QAction::MenuRole)menuRole -{ - return toQt(self)->menuRole(); -} - -- (void)setMenuRole: (QAction::MenuRole)menuRole -{ - toQt(self)->setMenuRole(menuRole); -} - -- (QAction::Priority)priority -{ - return toQt(self)->priority(); -} - -- (void)setPriority: (QAction::Priority)priority -{ - toQt(self)->setPriority(priority); -} - -- (QKeySequence)shortcut -{ - return toQt(self)->shortcut(); -} - -- (void)setShortcut: (QKeySequence)shortcut -{ - toQt(self)->setShortcut(shortcut); -} - -- (Qt::ShortcutContext)shortcutContext -{ - return toQt(self)->shortcutContext(); -} - -- (void)setShortcutContext: (Qt::ShortcutContext)shortcutContext -{ - toQt(self)->setShortcutContext(shortcutContext); -} - -- (OFString*)statusTip -{ - return toOF(toQt(self)->statusTip()); -} - -- (void)setStatusTip: (OFString*)statusTip -{ - toQt(self)->setStatusTip(toQt(statusTip)); -} - -- (OFString*)text -{ - return toOF(toQt(self)->text()); -} - -- (void)setText: (OFString*)text -{ - toQt(self)->setText(toQt(text)); -} - -- (OFString*)toolTip -{ - return toOF(toQt(self)->toolTip()); -} - -- (void)setToolTip: (OFString*)toolTip -{ - toQt(self)->setToolTip(toQt(toolTip)); -} - -- (bool)isVisible -{ - return toQt(self)->isVisible(); -} - -- (void)setVisible: (bool)visible -{ - toQt(self)->setVisible(visible); -} - -- (OFString*)whatsThis -{ - return toOF(toQt(self)->whatsThis()); -} - -- (void)setWhatsThis: (OFString*)whatsThis -{ - toQt(self)->setWhatsThis(toQt(whatsThis)); -} - -- (QActionGroup*)actionGroup -{ - return toQt(self)->actionGroup(); -} - -- (void)activate: (QAction::ActionEvent)event -{ - toQt(self)->activate(event); -} - -- (QList)associatedGraphicsWidgets -{ - return toQt(self)->associatedGraphicsWidgets(); -} - -- (OFArray OF_GENERIC(QtWidget*)*)associatedWidgets -{ - const QList &widgets = toQt(self)->associatedWidgets(); - OFMutableArray *ret = - [OFMutableArray arrayWithCapacity: widgets.count()]; - void *pool = objc_autoreleasePoolPush(); - - for (QWidget *widget: widgets) - [ret addObject: toOF(widget)]; - - [ret makeImmutable]; - - objc_autoreleasePoolPop(pool); - - return ret; -} - -- (QVariant)data -{ - return toQt(self)->data(); -} - -- (bool)isSeparator -{ - return toQt(self)->isSeparator(); -} - -- (QMenu*)menu -{ - return toQt(self)->menu(); -} - -- (QtWidget*)parentWidget -{ - return toOF(toQt(self)->parentWidget()); -} - -- (void)setActionGroup: (QActionGroup*)group -{ - toQt(self)->setActionGroup(group); -} - -- (void)setData: (const QVariant&)userData -{ - toQt(self)->setData(userData); -} - -- (void)setMenu: (QMenu*)menu -{ - toQt(self)->setMenu(menu); -} - -- (void)setSeparator: (bool)isSeparator -{ - toQt(self)->setSeparator(isSeparator); -} - -- (void)setShortcuts: (const QList&)shortcuts -{ - toQt(self)->setShortcuts(shortcuts); -} - -- (void)setShortcutsWithStandardKey: (QKeySequence::StandardKey)key -{ - toQt(self)->setShortcuts(key); -} - -- (QList)shortcuts -{ - return toQt(self)->shortcuts(); -} - -- (bool)showStatusText: (QtWidget*)widget -{ - return toQt(self)->showStatusText(toQt(widget)); -} -@end DELETED QtWidgets/QtApplication.h Index: QtWidgets/QtApplication.h ================================================================== --- QtWidgets/QtApplication.h +++ QtWidgets/QtApplication.h @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtGUIApplication.h" - -#include - -@interface QtApplication: QtGUIApplication -@property (readonly) QApplication *qApplication; -@property bool autoSIPEnabled; -@property int cursorFlashTime; -@property int doubleClickInterval; -@property of_dimension_t globalStrut; -@property int keyboardInputInterval; -@property int startDragDistance; -@property int startDragTime; -@property (copy) OFString *styleSheet; -@property int wheelScrollLines; - -- initWithQApplication: (QApplication*)qApplication; -- (void)aboutQt; -- (void)closeAllWindows; -@end - -namespace ObjQt { - -static OF_INLINE QtApplication* -toOF(QApplication *qApplication) -{ - return [[[QtApplication alloc] - initWithQApplication: qApplication] autorelease]; -} - -static OF_INLINE QApplication* -toQt(QtApplication *application) -{ - return [application qApplication]; -} - -} DELETED QtWidgets/QtApplication.mm Index: QtWidgets/QtApplication.mm ================================================================== --- QtWidgets/QtApplication.mm +++ QtWidgets/QtApplication.mm @@ -1,146 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtApplication.h" -#import "OFString+QString.h" - -#import "helpers.h" - -using ObjQt::toOF; -using ObjQt::toQt; - -@implementation QtApplication -- initWithQGuiApplication: (QGuiApplication*)qGuiApplication -{ - OF_INVALID_INIT_METHOD -} - -- initWithQApplication: (QApplication*)qApplication -{ - return [super initWithQGuiApplication: qApplication]; -} - -- (QApplication*)qApplication -{ - return qobject_cast(_qObject); -} - -- (bool)autoSIPEnabled -{ - return toQt(self)->autoSipEnabled(); -} - -- (void)setAutoSIPEnabled: (bool)autoSIPEnabled -{ - toQt(self)->setAutoSipEnabled(autoSIPEnabled); -} - -- (int)cursorFlashTime -{ - return toQt(self)->cursorFlashTime(); -} - -- (void)setCursorFlashTime: (int)cursorFlashTime -{ - toQt(self)->setCursorFlashTime(cursorFlashTime); -} - -- (int)doubleClickInterval -{ - return toQt(self)->doubleClickInterval(); -} - -- (void)setDoubleClickInterval: (int)doubleClickInterval -{ - toQt(self)->setDoubleClickInterval(doubleClickInterval); -} - -- (of_dimension_t)globalStrut -{ - return toOF(toQt(self)->globalStrut()); -} - -- (void)setGlobalStrut: (of_dimension_t)globalStrut -{ - toQt(self)->setGlobalStrut(toQt(globalStrut)); -} - -- (int)keyboardInputInterval -{ - return toQt(self)->keyboardInputInterval(); -} - -- (void)setKeyboardInputInterval: (int)keyboardInputInterval -{ - toQt(self)->setKeyboardInputInterval(keyboardInputInterval); -} - -- (int)startDragDistance -{ - return toQt(self)->startDragDistance(); -} - -- (void)setStartDragDistance: (int)startDragDistance -{ - toQt(self)->setStartDragDistance(startDragDistance); -} - -- (int)startDragTime -{ - return toQt(self)->startDragTime(); -} - -- (void)setStartDragTime: (int)startDragTime -{ - toQt(self)->setStartDragTime(startDragTime); -} - -- (OFString*)styleSheet -{ - return toOF(toQt(self)->styleSheet()); -} - -- (void)setStyleSheet: (OFString*)styleSheet -{ - toQt(self)->setStyleSheet(toQt(styleSheet)); -} - -- (int)wheelScrollLines -{ - return toQt(self)->wheelScrollLines(); -} - -- (void)setWheelScrollLines: (int)wheelScrollLines -{ - toQt(self)->setWheelScrollLines(wheelScrollLines); -} - -- (void)aboutQt -{ - toQt(self)->aboutQt(); -} - -- (void)closeAllWindows -{ - toQt(self)->closeAllWindows(); -} -@end DELETED QtWidgets/QtWidget.h Index: QtWidgets/QtWidget.h ================================================================== --- QtWidgets/QtWidget.h +++ QtWidgets/QtWidget.h @@ -1,240 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtObject.h" -#import "QtPaintDevice.h" - -#include - -@class QtAction; - -@interface QtWidget: QtObject -@property (readonly) QWidget *qWidget; -@property bool acceptDrops; -@property (copy) OFString *accessibleDescription; -@property (copy) OFString *accessibleName; -@property bool autoFillBackground; -@property of_dimension_t baseSize; -@property (readonly) of_rectangle_t childrenRect; -@property (readonly) QRegion childrenRegion; -@property Qt::ContextMenuPolicy contextMenuPolicy; -@property QCursor cursor; -@property (getter=isEnabled) bool enabled; -@property Qt::FocusPolicy focusPolicy; -@property const QFont &font; -@property (readonly) of_rectangle_t frameGeometry; -@property (readonly) of_dimension_t frameSize; -@property (readonly, getter=isFullScreen) bool fullScreen; -@property of_rectangle_t geometry; -@property (readonly) int height; -@property Qt::InputMethodHints inputMethodHints; -@property (readonly) bool isActiveWindow; -@property Qt::LayoutDirection layoutDirection; -@property QLocale locale; -@property (readonly, getter=isMaximized) bool maximized; -@property int maximumHeight; -@property of_dimension_t maximumSize; -@property int maximumWidth; -@property (readonly, getter=isMinimized) bool minimized; -@property int minimumHeight; -@property of_dimension_t minimumSize; -@property (readonly) of_dimension_t minimumSizeHint; -@property int minimumWidth; -@property (readonly, getter=isModal) bool modal; -@property (getter=hasMouseTracking) bool mouseTracking; -@property (readonly) of_rectangle_t normalGeometry; -@property const QPalette &palette; -@property (setter=moveToPosition:) of_point_t pos; -@property (readonly) of_rectangle_t rect; -@property (setter=resizeTo:) of_dimension_t size; -@property (readonly) of_dimension_t sizeHint; -@property of_dimension_t sizeIncrement; -@property QSizePolicy sizePolicy; -@property (copy) OFString *statusTip; -@property (copy) OFString *styleSheet; -@property (copy) OFString *toolTip; -@property int toolTipDuration; -@property bool updatesEnabled; -@property (getter=isVisible) bool visible; -@property (copy) OFString *whatsThis; -@property (readonly) int width; -@property Qt::WindowFlags windowFlags; -@property QIcon windowIcon; -@property Qt::WindowModality windowModality; -@property (getter=isWindowModified) bool windowModified; -@property double windowOpacity; -@property (copy) OFString *windowTitle; -@property (readonly) int x; -@property (readonly) int y; - -- initWithQWidget: (QWidget*)qWidget; -- (OFArray OF_GENERIC(QtAction*)*)actions; -- (void)activateWindow; -- (void)addAction: (QtAction*)action; -- (void)addActions: (OFArray OF_GENERIC(QtAction*)*)actions; -- (void)adjustSize; -- (QPalette::ColorRole)backgroundRole; -- (QBackingStore*)backingStore; -- (QtWidget*)childAt: (of_point_t)point; -- (void)clearFocus; -- (void)clearMask; -- (QMargins)contentsMargins; -- (of_rectangle_t)contentsRect; -- (WId)effectiveWinID; -- (void)ensurePolished; -- (QtWidget*)focusProxy; -- (QtWidget*)focusWidget; -- (QFontInfo)fontInfo; -- (QFontMetrics)fontMetrics; -- (QPalette::ColorRole)foregroundRole; -- (QPixmap)grabRectangle: (of_rectangle_t)rectangle; -- (void)grabGesture: (Qt::GestureType)gesture; -- (void)grabGesture: (Qt::GestureType)gesture - flags: (Qt::GestureFlags)flags; -- (void)grabKeyboard; -- (void)grabMouse; -- (void)grabMouseWithCursor: (const QCursor&)cursor; -- (int)grabShortcutWithKey: (const QKeySequence&)key; -- (int)grabShortcutWithKey: (const QKeySequence&)key - context: (Qt::ShortcutContext)context; -- (QGraphicsEffect*)graphicsEffect; -- (QGraphicsProxyWidget*)graphicsProxyWidget; -#ifdef QT_KEYPAD_NAVIGATION -- (bool)hasEditFocus; -#endif -- (bool)hasFocus; -- (bool)hasHeightForWidth; -- (int)heightForWidth: (int)w; -- (QVariant)queryInputMethod: (Qt::InputMethodQuery)query; -- (void)insertAction: (QtAction*)action - before: (QtAction*)before; -- (void)insertActions: (OFArray OF_GENERIC(QtAction*)*)actions - before: (QtAction*)before; -- (bool)isAncestorOf: (QtWidget*)child; -- (bool)isEnabledTo: (QtWidget*)ancestor; -- (bool)isHidden; -- (bool)isVisibleTo: (QtWidget*)ancestor; -- (bool)isWindow; -- (of_point_t)mapPosition: (of_point_t)pos - from: (QtWidget*)parent; -- (of_point_t)mapPositionFromGlobal: (of_point_t)pos; -- (of_point_t)mapPositionFromParent: (of_point_t)pos; -- (of_point_t)mapPosition: (of_point_t)pos - to: (QtWidget*)parent; -- (of_point_t)mapPositionToGlobal: (of_point_t)pos; -- (of_point_t)mapPositionToParent: (of_point_t)pos; -- (QRegion)mask; -- (QtWidget*)nativeParentWidget; -- (QtWidget*)nextInFocusChain; -- (void)overrideWindowFlags: (Qt::WindowFlags)flags; -- (QtWidget*)parentWidget; -- (QtWidget*)previousInFocusChain; -- (void)releaseKeyboard; -- (void)releaseMouse; -- (void)releaseShortcut: (int)ID; -- (void)removeAction: (QtAction*)action; -- (void)renderIntoPaintDevice: (QtObject *)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion; -- (void)renderIntoPaintDevice: (QtObject *)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion - flags: (QWidget::RenderFlags)renderFlags; -- (void)renderIntoPainter: (QPainter*)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion; -- (void)renderIntoPainter: (QPainter*)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion - flags: (QWidget::RenderFlags)renderFlags; -- (void)repaintInRectangle: (of_rectangle_t)rect; -- (void)repaintInRegion: (const QRegion&)region; -- (bool)restoreGeometry: (OFDataArray*)geometry; -- (OFDataArray*)saveGeometry; -- (void)scrollRight: (int)dx - down: (int)dy; -- (void)scrollRight: (int)dx - down: (int)dy - inRectangle: (of_rectangle_t)rect; -- (void)setAttribute: (Qt::WidgetAttribute)attribute - to: (bool)on; -#ifdef QT_KEYPAD_NAVIGATION -- (void)setEditFocus: (bool)enable; -#endif -- (void)setFixedHeight: (int)height; -- (void)setFixedSize: (of_dimension_t)size; -- (void)setFixedWidth: (int)width; -- (void)setFocus: (Qt::FocusReason)reason; -- (void)setFocusProxy: (QtWidget*)widget; -- (void)setForegroundRole: (QPalette::ColorRole)role; -- (void)setGraphicsEffect: (QGraphicsEffect*)effect; -- (void)setLayout: (QLayout*)layout; -- (void)setMaskFromBitmap: (const QBitmap&)bitmap; -- (void)setMask: (const QRegion&)region; -- (void)setParent: (QtWidget*)parent; -- (void)setParent: (QtWidget*)parent - flags: (Qt::WindowFlags)flags; -- (void)setAutoRepeat: (bool)enable - forShortcut: (int)ID; -- (void)setEnabled: (bool)enable - forShortcut: (int)ID; -- (void)setStyle: (QStyle*)style; -- (void)setWindowRole: (OFString*)role; -- (void)setWindowState: (Qt::WindowStates)windowState; -- (void)stackUnder: (QtWidget*)widget; -- (QStyle*)style; -- (bool)testAttribute: (Qt::WidgetAttribute)attribute; -- (bool)isUnderMouse; -- (void)ungrabGesture: (Qt::GestureType)gesture; -- (void)unsetCursor; -- (void)unsetLayoutDirection; -- (void)unsetLocale; -- (void)updateInRectangle: (of_rectangle_t)rect; -- (void)updateInRegion: (const QRegion&)region; -- (void)updateGeometry; -- (QRegion)visibleRegion; -- (WId)winID; -- (QtWidget*)window; -- (QWindow*)windowHandle; -- (OFString*)windowRole; -- (Qt::WindowStates)windowState; -- (Qt::WindowType)windowType; -@end - -@interface QtWidget (QtPaintDevice) -@end - -namespace ObjQt { - -static OF_INLINE QtWidget* -toOF(QWidget *qWidget) -{ - return [[[QtWidget alloc] initWithQWidget: qWidget] autorelease]; -} - -static OF_INLINE QWidget* -toQt(QtWidget *widget) -{ - return [widget qWidget]; -} - -} DELETED QtWidgets/QtWidget.mm Index: QtWidgets/QtWidget.mm ================================================================== --- QtWidgets/QtWidget.mm +++ QtWidgets/QtWidget.mm @@ -1,1114 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "QtWidget.h" -#import "QtAction.h" -#import "OFString+QString.h" -#import "OFDataArray+QByteArray.h" - -#import "helpers.h" - -#include -#include - -using ObjQt::toOF; -using ObjQt::toQt; - -@implementation QtWidget -+ (void)initialize -{ - if (self == [QtWidget class]) - [self inheritMethodsFromClass: [QtPaintDevice class]]; -} - -- initWithQObject: (QObject*)qObject -{ - OF_INVALID_INIT_METHOD -} - -- initWithQWidget: (QWidget*)qWidget -{ - return [super initWithQObject: qWidget]; -} - -- (QWidget*)qWidget -{ - return qobject_cast(_qObject); -} - -- (bool)acceptDrops -{ - return toQt(self)->acceptDrops(); -} - -- (void)setAcceptDrops: (bool)acceptDrops -{ - toQt(self)->setAcceptDrops(acceptDrops); -} - -- (OFString*)accessibleDescription -{ - return toOF(toQt(self)->accessibleDescription()); -} - -- (void)setAccessibleDescription: (OFString*)accessibleDescription -{ - toQt(self)->setAccessibleDescription(toQt(accessibleDescription)); -} - -- (OFString*)accessibleName -{ - return toOF(toQt(self)->accessibleName()); -} - -- (void)setAccessibleName: (OFString*)accessibleName -{ - toQt(self)->setAccessibleName(toQt(accessibleName)); -} - -- (bool)autoFillBackground -{ - return toQt(self)->autoFillBackground(); -} - -- (void)setAutoFillBackground: (bool)autoFillBackground -{ - toQt(self)->setAutoFillBackground(autoFillBackground); -} - -- (of_dimension_t)baseSize -{ - return toOF(toQt(self)->baseSize()); -} - -- (void)setBaseSize: (of_dimension_t)baseSize -{ - toQt(self)->setBaseSize(toQt(baseSize)); -} - -- (of_rectangle_t)childrenRect -{ - return toOF(toQt(self)->childrenRect()); -} - -- (QRegion)childrenRegion -{ - return toQt(self)->childrenRegion(); -} - -- (Qt::ContextMenuPolicy)contextMenuPolicy -{ - return toQt(self)->contextMenuPolicy(); -} - -- (void)setContextMenuPolicy: (Qt::ContextMenuPolicy)contextMenuPolicy -{ - toQt(self)->setContextMenuPolicy(contextMenuPolicy); -} - -- (QCursor)cursor -{ - return toQt(self)->cursor(); -} - -- (void)setCursor: (QCursor)cursor -{ - toQt(self)->setCursor(cursor); -} - -- (void)unsetCursor -{ - toQt(self)->unsetCursor(); -} - -- (bool)isEnabled -{ - return toQt(self)->isEnabled(); -} - -- (void)setEnabled: (bool)enabled -{ - toQt(self)->setEnabled(enabled); -} - -- (bool)hasFocus -{ - return toQt(self)->hasFocus(); -} - -- (Qt::FocusPolicy)focusPolicy -{ - return toQt(self)->focusPolicy(); -} - -- (void)setFocusPolicy: (Qt::FocusPolicy)focusPolicy -{ - toQt(self)->setFocusPolicy(focusPolicy); -} - -- (const QFont&)font -{ - return toQt(self)->font(); -} - -- (void)setFont: (const QFont&)font -{ - toQt(self)->setFont(font); -} - -- (of_rectangle_t)frameGeometry -{ - return toOF(toQt(self)->frameGeometry()); -} - -- (of_dimension_t)frameSize -{ - return toOF(toQt(self)->frameSize()); -} - -- (bool)isFullScreen -{ - return toQt(self)->isFullScreen(); -} - -- (of_rectangle_t)geometry -{ - return toOF(toQt(self)->geometry()); -} - -- (void)setGeometry: (of_rectangle_t)geometry -{ - toQt(self)->setGeometry(toQt(geometry)); -} - -- (int)height -{ - return toQt(self)->height(); -} - -- (Qt::InputMethodHints)inputMethodHints -{ - return toQt(self)->inputMethodHints(); -} - -- (void)setInputMethodHints: (Qt::InputMethodHints)inputMethodHints -{ - toQt(self)->setInputMethodHints(inputMethodHints); -} - -- (bool)isActiveWindow -{ - return toQt(self)->isActiveWindow(); -} - -- (Qt::LayoutDirection)layoutDirection -{ - return toQt(self)->layoutDirection(); -} - -- (void)setLayoutDirection: (Qt::LayoutDirection)layoutDirection -{ - toQt(self)->setLayoutDirection(layoutDirection); -} - -- (void)unsetLayoutDirection -{ - toQt(self)->unsetLayoutDirection(); -} - -- (QLocale)locale -{ - return toQt(self)->locale(); -} - -- (void)setLocale: (QLocale)locale -{ - toQt(self)->setLocale(locale); -} - -- (void)unsetLocale -{ - toQt(self)->unsetLocale(); -} - -- (bool)isMaximized -{ - return toQt(self)->isMaximized(); -} - -- (int)maximumHeight -{ - return toQt(self)->maximumHeight(); -} - -- (void)setMaximumHeight: (int)maximumHeight -{ - toQt(self)->setMaximumHeight(maximumHeight); -} - -- (of_dimension_t)maximumSize -{ - return toOF(toQt(self)->maximumSize()); -} - -- (void)setMaximumSize: (of_dimension_t)maximumSize -{ - toQt(self)->setMaximumSize(toQt(maximumSize)); -} - -- (int)maximumWidth -{ - return toQt(self)->maximumWidth(); -} - -- (void)setMaximumWidth: (int)maximumWidth -{ - toQt(self)->setMaximumWidth(maximumWidth); -} - -- (bool)isMinimized -{ - return toQt(self)->isMinimized(); -} - -- (int)minimumHeight -{ - return toQt(self)->minimumHeight(); -} - -- (void)setMinimumHeight: (int)minimumHeight -{ - toQt(self)->setMinimumHeight(minimumHeight); -} - -- (of_dimension_t)minimumSize -{ - return toOF(toQt(self)->minimumSize()); -} - -- (void)setMinimumSize: (of_dimension_t)minimumSize -{ - toQt(self)->setMinimumSize(toQt(minimumSize)); -} - -- (of_dimension_t)minimumSizeHint -{ - return toOF(toQt(self)->minimumSizeHint()); -} - -- (int)minimumWidth -{ - return toQt(self)->minimumWidth(); -} - -- (void)setMinimumWidth: (int)minimumWidth -{ - toQt(self)->setMinimumWidth(minimumWidth); -} - -- (bool)isModal -{ - return toQt(self)->isModal(); -} - -- (bool)hasMouseTracking -{ - return toQt(self)->hasMouseTracking(); -} - -- (void)setMouseTracking: (bool)mouseTracking -{ - toQt(self)->setMouseTracking(mouseTracking); -} - -- (of_rectangle_t)normalGeometry -{ - return toOF(toQt(self)->normalGeometry()); -} - -- (const QPalette&)palette -{ - return toQt(self)->palette(); -} - -- (void)setPalette: (const QPalette&)palette -{ - toQt(self)->setPalette(palette); -} - -- (of_point_t)pos -{ - return toOF(toQt(self)->pos()); -} - -- (void)moveToPosition: (of_point_t)pos -{ - toQt(self)->move(toQt(pos)); -} - -- (of_rectangle_t)rect -{ - return toOF(toQt(self)->rect()); -} - -- (of_dimension_t)size -{ - return toOF(toQt(self)->size()); -} - -- (void)resizeTo: (of_dimension_t)size -{ - toQt(self)->resize(toQt(size)); -} - -- (of_dimension_t)sizeHint -{ - return toOF(toQt(self)->sizeHint()); -} - -- (of_dimension_t)sizeIncrement -{ - return toOF(toQt(self)->sizeIncrement()); -} - -- (void)setSizeIncrement: (of_dimension_t)sizeIncrement -{ - toQt(self)->setSizeIncrement(toQt(sizeIncrement)); -} - -- (QSizePolicy)sizePolicy -{ - return toQt(self)->sizePolicy(); -} - -- (void)setSizePolicy: (QSizePolicy)sizePolicy -{ - toQt(self)->setSizePolicy(sizePolicy); -} - -- (OFString*)statusTip -{ - return toOF(toQt(self)->statusTip()); -} - -- (void)setStatusTip: (OFString*)statusTip -{ - toQt(self)->setStatusTip(toQt(statusTip)); -} - -- (OFString*)styleSheet -{ - return toOF(toQt(self)->styleSheet()); -} - -- (void)setStyleSheet: (OFString*)styleSheet -{ - toQt(self)->setStyleSheet(toQt(styleSheet)); -} - -- (OFString*)toolTip -{ - return toOF(toQt(self)->toolTip()); -} - -- (void)setToolTip: (OFString*)toolTip -{ - toQt(self)->setToolTip(toQt(toolTip)); -} - -- (int)toolTipDuration -{ - return toQt(self)->toolTipDuration(); -} - -- (void)setToolTipDuration: (int)toolTipDuration -{ - toQt(self)->setToolTipDuration(toolTipDuration); -} - -- (bool)updatesEnabled -{ - return toQt(self)->updatesEnabled(); -} - -- (void)setUpdatesEnabled: (bool)updatesEnabled -{ - toQt(self)->setUpdatesEnabled(updatesEnabled); -} - -- (bool)isVisible -{ - return toQt(self)->isVisible(); -} - -- (void)setVisible: (bool)visible -{ - toQt(self)->setVisible(visible); -} - -- (OFString*)whatsThis -{ - return toOF(toQt(self)->whatsThis()); -} - -- (void)setWhatsThis: (OFString*)whatsThis -{ - toQt(self)->setWhatsThis(toQt(whatsThis)); -} - -- (int)width -{ - return toQt(self)->width(); -} - -- (OFString*)windowFilePath -{ - return toOF(toQt(self)->windowFilePath()); -} - -- (void)setWindowFilePath: (OFString*)windowFilePath -{ - toQt(self)->setWindowFilePath(toQt(windowFilePath)); -} - -- (Qt::WindowFlags)windowFlags -{ - return toQt(self)->windowFlags(); -} - -- (void)setWindowFlags: (Qt::WindowFlags)windowFlags -{ - toQt(self)->setWindowFlags(windowFlags); -} - -- (QIcon)windowIcon -{ - return toQt(self)->windowIcon(); -} - -- (void)setWindowIcon: (QIcon)windowIcon -{ - toQt(self)->setWindowIcon(windowIcon); -} - -- (Qt::WindowModality)windowModality -{ - return toQt(self)->windowModality(); -} - -- (void)setWindowModality: (Qt::WindowModality)windowModality -{ - toQt(self)->setWindowModality(windowModality); -} - -- (bool)isWindowModified -{ - return toQt(self)->isWindowModified(); -} - -- (void)setWindowModified: (bool)windowModified -{ - toQt(self)->setWindowModified(windowModified); -} - -- (double)windowOpacity -{ - return toQt(self)->windowOpacity(); -} - -- (void)setWindowOpacity: (double)windowOpacity -{ - toQt(self)->setWindowOpacity(windowOpacity); -} - -- (OFString*)windowTitle -{ - return toOF(toQt(self)->windowTitle()); -} - -- (void)setWindowTitle: (OFString*)windowTitle -{ - toQt(self)->setWindowTitle(toQt(windowTitle)); -} - -- (int)x -{ - return toQt(self)->x(); -} - -- (int)y -{ - return toQt(self)->y(); -} - -- (OFArray OF_GENERIC(QtAction*)*)actions -{ - const QList &actions = toQt(self)->actions(); - OFMutableArray *ret = - [OFMutableArray arrayWithCapacity: actions.count()]; - void *pool = objc_autoreleasePoolPush(); - - for (QAction *action: actions) - [ret addObject: toOF(action)]; - - [ret makeImmutable]; - - objc_autoreleasePoolPop(pool); - - return ret; -} - -- (void)activateWindow -{ - toQt(self)->activateWindow(); -} - -- (void)addAction: (QtAction*)action -{ - toQt(self)->addAction(toQt(action)); -} - -- (void)addActions: (OFArray OF_GENERIC(QtAction*)*)actions -{ - QList list; - - for (QtAction *action in actions) - list.append(toQt(action)); - - toQt(self)->addActions(list); -} - -- (void)adjustSize -{ - toQt(self)->adjustSize(); -} - -- (QPalette::ColorRole)backgroundRole -{ - return toQt(self)->backgroundRole(); -} - -- (QBackingStore*)backingStore -{ - return toQt(self)->backingStore(); -} - -- (QtWidget*)childAt: (of_point_t)point -{ - return toOF(toQt(self)->childAt(toQt(point))); -} - -- (void)clearFocus -{ - return toQt(self)->clearFocus(); -} - -- (void)clearMask -{ - toQt(self)->clearMask(); -} - -- (QMargins)contentsMargins -{ - return toQt(self)->contentsMargins(); -} - -- (of_rectangle_t)contentsRect -{ - return toOF(toQt(self)->contentsRect()); -} - -- (WId)effectiveWinID -{ - return toQt(self)->effectiveWinId(); -} - -- (void)ensurePolished -{ - toQt(self)->ensurePolished(); -} - -- (QtWidget*)focusProxy -{ - return toOF(toQt(self)->focusProxy()); -} - -- (QtWidget*)focusWidget -{ - return toOF(toQt(self)->focusWidget()); -} - -- (QFontInfo)fontInfo -{ - return toQt(self)->fontInfo(); -} - -- (QFontMetrics)fontMetrics -{ - return toQt(self)->fontMetrics(); -} - -- (QPalette::ColorRole)foregroundRole -{ - return toQt(self)->foregroundRole(); -} - -- (QPixmap)grabRectangle: (of_rectangle_t)rectangle -{ - return toQt(self)->grab(toQt(rectangle)); -} - -- (void)grabGesture: (Qt::GestureType)gesture -{ - toQt(self)->grabGesture(gesture); -} - -- (void)grabGesture: (Qt::GestureType)gesture - flags: (Qt::GestureFlags)flags -{ - toQt(self)->grabGesture(gesture, flags); -} - -- (void)grabKeyboard -{ - toQt(self)->grabKeyboard(); -} - -- (void)grabMouse -{ - toQt(self)->grabMouse(); -} - -- (void)grabMouseWithCursor: (const QCursor&)cursor -{ - toQt(self)->grabMouse(cursor); -} - -- (int)grabShortcutWithKey: (const QKeySequence&)key -{ - return toQt(self)->grabShortcut(key); -} - -- (int)grabShortcutWithKey: (const QKeySequence&)key - context: (Qt::ShortcutContext)context -{ - return toQt(self)->grabShortcut(key, context); -} - -- (QGraphicsEffect*)graphicsEffect -{ - return toQt(self)->graphicsEffect(); -} - -- (QGraphicsProxyWidget*)graphicsProxyWidget -{ - return toQt(self)->graphicsProxyWidget(); -} - -#ifdef QT_KEYPAD_NAVIGATION -- (bool)hasEditFocus -{ - return toQt(self)->hasEditFocus(); -} -#endif - -- (bool)hasHeightForWidth -{ - return toQt(self)->hasHeightForWidth(); -} - -- (int)heightForWidth: (int)w -{ - return toQt(self)->heightForWidth(w); -} - -- (QVariant)queryInputMethod: (Qt::InputMethodQuery)query -{ - return toQt(self)->inputMethodQuery(query); -} - -- (void)insertAction: (QtAction*)action - before: (QtAction*)before -{ - toQt(self)->insertAction(toQt(before), toQt(action)); -} - -- (void)insertActions: (OFArray OF_GENERIC(QtAction*)*)actions - before: (QtAction*)before -{ - QList list; - - for (QtAction *action in actions) - list.append(toQt(action)); - - toQt(self)->insertActions(toQt(before), list); -} - -- (bool)isAncestorOf: (QtWidget*)child -{ - return toQt(self)->isAncestorOf(toQt(child)); -} - -- (bool)isEnabledTo: (QtWidget*)ancestor -{ - return toQt(self)->isEnabledTo(toQt(ancestor)); -} - -- (bool)isHidden -{ - return toQt(self)->isHidden(); -} - -- (bool)isVisibleTo: (QtWidget*)ancestor -{ - return toQt(self)->isVisibleTo(toQt(ancestor)); -} - -- (bool)isWindow -{ - return toQt(self)->isWindow(); -} - -- (of_point_t)mapPosition: (of_point_t)pos - from: (QtWidget*)parent -{ - return toOF(toQt(self)->mapFrom(toQt(parent), toQt(pos))); -} - -- (of_point_t)mapPositionFromGlobal: (of_point_t)pos -{ - return toOF(toQt(self)->mapFromGlobal(toQt(pos))); -} - -- (of_point_t)mapPositionFromParent: (of_point_t)pos -{ - return toOF(toQt(self)->mapFromParent(toQt(pos))); -} - -- (of_point_t)mapPosition: (of_point_t)pos - to: (QtWidget*)parent -{ - return toOF(toQt(self)->mapTo(toQt(parent), toQt(pos))); -} - -- (of_point_t)mapPositionToGlobal: (of_point_t)pos -{ - return toOF(toQt(self)->mapToGlobal(toQt(pos))); -} - -- (of_point_t)mapPositionToParent: (of_point_t)pos -{ - return toOF(toQt(self)->mapToParent(toQt(pos))); -} - -- (QRegion)mask -{ - return toQt(self)->mask(); -} - -- (QtWidget*)nativeParentWidget -{ - return toOF(toQt(self)->nativeParentWidget()); -} - -- (QtWidget*)nextInFocusChain -{ - return toOF(toQt(self)->nextInFocusChain()); -} - -- (void)overrideWindowFlags: (Qt::WindowFlags)flags -{ - toQt(self)->overrideWindowFlags(flags); -} - -- (QtWidget*)parentWidget -{ - return toOF(toQt(self)->parentWidget()); -} - -- (QtWidget*)previousInFocusChain -{ - return toOF(toQt(self)->previousInFocusChain()); -} - -- (void)releaseKeyboard -{ - toQt(self)->releaseKeyboard(); -} - -- (void)releaseMouse -{ - toQt(self)->releaseMouse(); -} - -- (void)releaseShortcut: (int)ID -{ - toQt(self)->releaseShortcut(ID); -} - -- (void)removeAction: (QtAction*)action -{ - toQt(self)->removeAction(toQt(action)); -} - -- (void)renderIntoPaintDevice: (QtObject *)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion -{ - toQt(self)->render([target qPaintDevice], toQt(targetOffset), - sourceRegion); -} - -- (void)renderIntoPaintDevice: (QtObject *)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion - flags: (QWidget::RenderFlags)renderFlags -{ - toQt(self)->render([target qPaintDevice], toQt(targetOffset), - sourceRegion, renderFlags); -} - -- (void)renderIntoPainter: (QPainter*)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion -{ - toQt(self)->render(target, toQt(targetOffset), sourceRegion); -} - -- (void)renderIntoPainter: (QPainter*)target - targetOffset: (of_point_t)targetOffset - sourceRegion: (QRegion)sourceRegion - flags: (QWidget::RenderFlags)renderFlags -{ - toQt(self)->render(target, toQt(targetOffset), sourceRegion, - renderFlags); -} - -- (void)repaintInRectangle: (of_rectangle_t)rect -{ - toQt(self)->repaint(toQt(rect)); -} - -- (void)repaintInRegion: (const QRegion&)region -{ - toQt(self)->repaint(region); -} - -- (bool)restoreGeometry: (OFDataArray*)geometry -{ - return toQt(self)->restoreGeometry(toQt(geometry)); -} - -- (OFDataArray*)saveGeometry -{ - return toOF(toQt(self)->saveGeometry()); -} - -- (void)scrollRight: (int)dx - down: (int)dy -{ - toQt(self)->scroll(dx, dy); -} - -- (void)scrollRight: (int)dx - down: (int)dy - inRectangle: (of_rectangle_t)rect -{ - toQt(self)->scroll(dx, dy, toQt(rect)); -} - -- (void)setAttribute: (Qt::WidgetAttribute)attribute - to: (bool)on -{ - toQt(self)->setAttribute(attribute, on); -} - -#ifdef QT_KEYPAD_NAVIGATION -- (void)setEditFocus: (bool)enable -{ - toQt(self)->setEditFocus(enable); -} -#endif - -- (void)setFixedHeight: (int)height -{ - toQt(self)->setFixedHeight(height); -} - -- (void)setFixedSize: (of_dimension_t)size -{ - toQt(self)->setFixedSize(toQt(size)); -} - -- (void)setFixedWidth: (int)width -{ - toQt(self)->setFixedWidth(width); -} - -- (void)setFocus: (Qt::FocusReason)reason -{ - toQt(self)->setFocus(reason); -} - -- (void)setFocusProxy: (QtWidget*)widget -{ - toQt(self)->setFocusProxy(toQt(widget)); -} - -- (void)setForegroundRole: (QPalette::ColorRole)role -{ - toQt(self)->setForegroundRole(role); -} - -- (void)setGraphicsEffect: (QGraphicsEffect*)effect -{ - toQt(self)->setGraphicsEffect(effect); -} - -- (void)setLayout: (QLayout*)layout -{ - toQt(self)->setLayout(layout); -} - -- (void)setMaskFromBitmap: (const QBitmap&)bitmap -{ - toQt(self)->setMask(bitmap); -} - -- (void)setMask: (const QRegion&)region -{ - toQt(self)->setMask(region); -} - -- (void)setParent: (QtWidget*)parent -{ - toQt(self)->setParent(toQt(parent)); -} - -- (void)setParent: (QtWidget*)parent - flags: (Qt::WindowFlags)flags -{ - toQt(self)->setParent(toQt(parent), flags); -} - -- (void)setAutoRepeat: (bool)enable - forShortcut: (int)ID -{ - toQt(self)->setShortcutAutoRepeat(ID, enable); -} - -- (void)setEnabled: (bool)enable - forShortcut: (int)ID -{ - toQt(self)->setShortcutEnabled(ID, enable); -} - -- (void)setStyle: (QStyle*)style -{ - toQt(self)->setStyle(style); -} - -- (void)setWindowRole: (OFString*)role -{ - toQt(self)->setWindowRole(toQt(role)); -} - -- (void)setWindowState: (Qt::WindowStates)windowState -{ - toQt(self)->setWindowState(windowState); -} - -- (void)stackUnder: (QtWidget*)widget -{ - toQt(self)->stackUnder(toQt(widget)); -} - -- (QStyle*)style -{ - return toQt(self)->style(); -} - -- (bool)testAttribute: (Qt::WidgetAttribute)attribute -{ - return toQt(self)->testAttribute(attribute); -} - -- (bool)isUnderMouse -{ - return toQt(self)->underMouse(); -} - -- (void)ungrabGesture: (Qt::GestureType)gesture -{ - toQt(self)->ungrabGesture(gesture); -} - -- (void)updateInRectangle: (of_rectangle_t)rect -{ - toQt(self)->update(toQt(rect)); -} - -- (void)updateInRegion: (const QRegion&)region -{ - toQt(self)->update(region); -} - -- (void)updateGeometry -{ - toQt(self)->updateGeometry(); -} - -- (QRegion)visibleRegion -{ - return toQt(self)->visibleRegion(); -} - -- (WId)winID -{ - return toQt(self)->winId(); -} - -- (QtWidget*)window -{ - return toOF(toQt(self)->window()); -} - -- (QWindow*)windowHandle -{ - return toQt(self)->windowHandle(); -} - -- (OFString*)windowRole -{ - return toOF(toQt(self)->windowRole()); -} - -- (Qt::WindowStates)windowState -{ - return toQt(self)->windowState(); -} - -- (Qt::WindowType)windowType -{ - return toQt(self)->windowType(); -} -@end ADDED build-aux/config.guess Index: build-aux/config.guess ================================================================== --- build-aux/config.guess +++ build-aux/config.guess @@ -0,0 +1,1421 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2014 Free Software Foundation, Inc. + +timestamp='2014-11-04' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches to . + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2014 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +esac + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: ADDED build-aux/config.sub Index: build-aux/config.sub ================================================================== --- build-aux/config.sub +++ build-aux/config.sub @@ -0,0 +1,1811 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2014 Free Software Foundation, Inc. + +timestamp='2014-12-03' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to . +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2014 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be | arm64 \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* | arm64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + psp) + basic_machine=mipsallegrexel-psp + os=-elf + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: ADDED build-aux/install-sh Index: build-aux/install-sh ================================================================== --- build-aux/install-sh +++ build-aux/install-sh @@ -0,0 +1,501 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2013-12-25.23; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +tab=' ' +nl=' +' +IFS=" $tab$nl" + +# Set DOITPROG to "echo" to test this script. + +doit=${DOITPROG-} +doit_exec=${doit:-exec} + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +is_target_a_directory=possibly + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + dstdir=`dirname "$dst"` + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + oIFS=$IFS + IFS=/ + set -f + set fnord $dstdir + shift + set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + set +f && + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: ADDED build-aux/m4/ax_check_compiler_flags.m4 Index: build-aux/m4/ax_check_compiler_flags.m4 ================================================================== --- build-aux/m4/ax_check_compiler_flags.m4 +++ build-aux/m4/ax_check_compiler_flags.m4 @@ -0,0 +1,78 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_check_compiler_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE]) +# +# DESCRIPTION +# +# Check whether the given compiler FLAGS work with the current language's +# compiler, or whether they give an error. (Warnings, however, are +# ignored.) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Matteo Frigo +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Macro Archive. When you make and +# distribute a modified version of the Autoconf Macro, you may extend this +# special exception to the GPL to apply to your modified version as well. + +AC_DEFUN([AX_CHECK_COMPILER_FLAGS], +[AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX +AC_MSG_CHECKING([whether _AC_LANG compiler accepts $1]) +dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname: +AS_LITERAL_IF([$1], + [AC_CACHE_VAL(AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1), [ + ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes, + AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no) + _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS])], + [ax_save_FLAGS=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$1" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=yes, + eval AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1)=no) + _AC_LANG_PREFIX[]FLAGS=$ax_save_FLAGS]) +eval ax_check_compiler_flags=$AS_TR_SH(ax_cv_[]_AC_LANG_ABBREV[]_flags_$1) +AC_MSG_RESULT($ax_check_compiler_flags) +if test "x$ax_check_compiler_flags" = xyes; then + m4_default([$2], :) +else + m4_default([$3], :) +fi +])dnl AX_CHECK_COMPILER_FLAGS ADDED build-aux/m4/buildsys.m4 Index: build-aux/m4/buildsys.m4 ================================================================== --- build-aux/m4/buildsys.m4 +++ build-aux/m4/buildsys.m4 @@ -0,0 +1,219 @@ +dnl +dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017 +dnl Jonathan Schleifer +dnl +dnl https://heap.zone/git/?p=buildsys.git +dnl +dnl Permission to use, copy, modify, and/or distribute this software for any +dnl purpose with or without fee is hereby granted, provided that the above +dnl copyright notice and this permission notice is present in all copies. +dnl +dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +dnl AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +dnl ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +dnl LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +dnl CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +dnl POSSIBILITY OF SUCH DAMAGE. +dnl + +AC_DEFUN([BUILDSYS_INIT], [ + AC_CONFIG_COMMANDS_PRE([ + AC_SUBST(CC_DEPENDS, $GCC) + AC_SUBST(CXX_DEPENDS, $GXX) + AC_SUBST(OBJC_DEPENDS, $GOBJC) + AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX) + + AC_PATH_PROG(TPUT, tput) + + AS_IF([test x"$TPUT" != x""], [ + if x=$($TPUT el 2>/dev/null); then + AC_SUBST(TERM_EL, "$x") + else + AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)") + fi + + if x=$($TPUT sgr0 2>/dev/null); then + AC_SUBST(TERM_SGR0, "$x") + else + AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)") + fi + + if x=$($TPUT bold 2>/dev/null); then + AC_SUBST(TERM_BOLD, "$x") + else + AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)") + fi + + if x=$($TPUT setaf 1 2>/dev/null); then + AC_SUBST(TERM_SETAF1, "$x") + AC_SUBST(TERM_SETAF2, + "$($TPUT setaf 2 2>/dev/null)") + AC_SUBST(TERM_SETAF3, + "$($TPUT setaf 3 2>/dev/null)") + AC_SUBST(TERM_SETAF4, + "$($TPUT setaf 4 2>/dev/null)") + AC_SUBST(TERM_SETAF6, + "$($TPUT setaf 6 2>/dev/null)") + else + AC_SUBST(TERM_SETAF1, + "$($TPUT AF 1 2>/dev/null)") + AC_SUBST(TERM_SETAF2, + "$($TPUT AF 2 2>/dev/null)") + AC_SUBST(TERM_SETAF3, + "$($TPUT AF 3 2>/dev/null)") + AC_SUBST(TERM_SETAF4, + "$($TPUT AF 4 2>/dev/null)") + AC_SUBST(TERM_SETAF6, + "$($TPUT AF 6 2>/dev/null)") + fi + ], [ + AC_SUBST(TERM_EL, '\033\133K') + AC_SUBST(TERM_SGR0, '\033\133m') + AC_SUBST(TERM_BOLD, '\033\1331m') + AC_SUBST(TERM_SETAF1, '\033\13331m') + AC_SUBST(TERM_SETAF2, '\033\13332m') + AC_SUBST(TERM_SETAF3, '\033\13333m') + AC_SUBST(TERM_SETAF4, '\033\13334m') + AC_SUBST(TERM_SETAF6, '\033\13336m') + ]) + ]) + + AC_CONFIG_COMMANDS_POST([ + ${as_echo:="echo"} ${as_me:="configure"}": touching .deps files" + for i in $(find . -name Makefile); do + DEPSFILE="$(dirname $i)/.deps" + test -f "$DEPSFILE" && rm "$DEPSFILE" + touch -t 0001010000 "$DEPSFILE" + done + ]) +]) + +AC_DEFUN([BUILDSYS_PROG_IMPLIB], [ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_MSG_CHECKING(whether we need an implib) + case "$host_os" in + cygwin* | mingw*) + AC_MSG_RESULT(yes) + PROG_IMPLIB_NEEDED='yes' + PROG_IMPLIB_LDFLAGS='-Wl,--export-all-symbols,--out-implib,lib${PROG}.a' + ;; + *) + AC_MSG_RESULT(no) + PROG_IMPLIB_NEEDED='no' + PROG_IMPLIB_LDFLAGS='' + ;; + esac + + AC_SUBST(PROG_IMPLIB_NEEDED) + AC_SUBST(PROG_IMPLIB_LDFLAGS) +]) + +AC_DEFUN([BUILDSYS_SHARED_LIB], [ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_MSG_CHECKING(for shared library system) + case "$host_os" in + darwin*) + AC_MSG_RESULT(Darwin) + LIB_CFLAGS='-fPIC -DPIC' + LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}' + LIB_PREFIX='lib' + LIB_SUFFIX='.dylib' + LDFLAGS_RPATH='-Wl,-rpath,${libdir}' + LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib' + PLUGIN_CFLAGS='-fPIC -DPIC' + PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup' + PLUGIN_SUFFIX='.bundle' + INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' + CLEAN_LIB='' + ;; + mingw* | cygwin*) + AC_MSG_RESULT(MinGW / Cygwin) + LIB_CFLAGS='' + LIB_LDFLAGS='-shared -Wl,--export-all-symbols,--out-implib,${SHARED_LIB}.a' + LIB_PREFIX='lib' + LIB_SUFFIX='.dll' + LDFLAGS_RPATH='-Wl,-rpath,${libdir}' + PLUGIN_CFLAGS='' + PLUGIN_LDFLAGS='-shared' + PLUGIN_SUFFIX='.dll' + INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' + UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' + CLEAN_LIB='${SHARED_LIB}.a' + ;; + openbsd* | mirbsd*) + AC_MSG_RESULT(OpenBSD) + LIB_CFLAGS='-fPIC -DPIC' + LIB_LDFLAGS='-shared' + LIB_PREFIX='lib' + LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}' + LDFLAGS_RPATH='-Wl,-rpath,${libdir}' + PLUGIN_CFLAGS='-fPIC -DPIC' + PLUGIN_LDFLAGS='-shared' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i' + CLEAN_LIB='' + ;; + solaris*) + AC_MSG_RESULT(Solaris) + LIB_CFLAGS='-fPIC -DPIC' + LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}' + LIB_PREFIX='lib' + LIB_SUFFIX='.so' + LDFLAGS_RPATH='-Wl,-rpath,${libdir}' + PLUGIN_CFLAGS='-fPIC -DPIC' + PLUGIN_LDFLAGS='-shared' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}' + CLEAN_LIB='' + ;; + *-android*) + AC_MSG_RESULT(Android) + LIB_CFLAGS='-fPIC -DPIC' + LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}' + LIB_PREFIX='lib' + LIB_SUFFIX='.so' + LDFLAGS_RPATH='' + PLUGIN_CFLAGS='-fPIC -DPIC' + PLUGIN_LDFLAGS='-shared' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' + CLEAN_LIB='' + ;; + *) + AC_MSG_RESULT(ELF) + LIB_CFLAGS='-fPIC -DPIC' + LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}' + LIB_PREFIX='lib' + LIB_SUFFIX='.so' + LDFLAGS_RPATH='-Wl,-rpath,${libdir}' + PLUGIN_CFLAGS='-fPIC -DPIC' + PLUGIN_LDFLAGS='-shared' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' + CLEAN_LIB='' + ;; + esac + + AC_SUBST(LIB_CFLAGS) + AC_SUBST(LIB_LDFLAGS) + AC_SUBST(LIB_PREFIX) + AC_SUBST(LIB_SUFFIX) + AC_SUBST(LDFLAGS_RPATH) + AC_SUBST(LDFLAGS_INSTALL_NAME) + AC_SUBST(PLUGIN_CFLAGS) + AC_SUBST(PLUGIN_LDFLAGS) + AC_SUBST(PLUGIN_SUFFIX) + AC_SUBST(INSTALL_LIB) + AC_SUBST(UNINSTALL_LIB) + AC_SUBST(CLEAN_LIB) +]) ADDED buildsys.mk.in Index: buildsys.mk.in ================================================================== --- buildsys.mk.in +++ buildsys.mk.in @@ -0,0 +1,892 @@ +# +# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, +# 2017 +# Jonathan Schleifer +# +# https://heap.zone/git/?p=buildsys.git +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice is present in all copies. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +AS = @AS@ +CC = @CC@ +CXX = @CXX@ +CPP = @CPP@ +DC = @DC@ +ERLC = @ERLC@ +OBJC = @OBJC@ +OBJCXX = @OBJCXX@ +AR = @AR@ +LD = ${CC} +RANLIB = @RANLIB@ +PYTHON = @PYTHON@ +ASFLAGS = @ASFLAGS@ +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ +CPPFLAGS = @CPPFLAGS@ +DFLAGS = @DFLAGS@ +ERLCFLAGS = @ERLCFLAGS@ +OBJCFLAGS = @OBJCFLAGS@ +OBJCXXFLAGS = @OBJCXXFLAGS@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_RPATH = @LDFLAGS_RPATH@ +LDFLAGS_INSTALL_NAME = @LDFLAGS_INSTALL_NAME@ +LIBS = @LIBS@ +PYTHON_FLAGS = @PYTHON_FLAGS@ +PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@ +PROG_IMPLIB_LDFLAGS = @PROG_IMPLIB_LDFLAGS@ +PROG_SUFFIX = @EXEEXT@ +LIB_CFLAGS = @LIB_CFLAGS@ +LIB_LDFLAGS = @LIB_LDFLAGS@ +LIB_PREFIX = @LIB_PREFIX@ +LIB_SUFFIX = @LIB_SUFFIX@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ +INSTALL_LIB = @INSTALL_LIB@ +UNINSTALL_LIB = @UNINSTALL_LIB@ +CLEAN_LIB = @CLEAN_LIB@ +AS_DEPENDS = @AS_DEPENDS@ +CC_DEPENDS = @CC_DEPENDS@ +CXX_DEPENDS = @CXX_DEPENDS@ +OBJC_DEPENDS = @OBJC_DEPENDS@ +OBJCXX_DEPENDS = @OBJCXX_DEPENDS@ +LN_S = @LN_S@ +MKDIR_P = mkdir -p +INSTALL = @INSTALL@ +SHELL = @SHELL@ +MSGFMT = @MSGFMT@ +JAVAC = @JAVAC@ +JAVACFLAGS = @JAVACFLAGS@ +JAR = @JAR@ +WINDRES = @WINDRES@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +libdir = @libdir@ +plugindir ?= ${libdir}/${PACKAGE_NAME} +datarootdir = @datarootdir@ +datadir = @datadir@ +includedir = @includedir@ +includesubdir ?= ${PACKAGE_NAME} +localedir = @localedir@ +localename ?= ${PACKAGE_NAME} +mandir = @mandir@ +mansubdir ?= man1 + +OBJS1 = ${SRCS:.c=.o} +OBJS2 = ${OBJS1:.cc=.o} +OBJS3 = ${OBJS2:.cxx=.o} +OBJS4 = ${OBJS3:.d=.o} +OBJS5 = ${OBJS4:.erl=.beam} +OBJS6 = ${OBJS5:.java=.class} +OBJS7 = ${OBJS6:.m=.o} +OBJS8 = ${OBJS7:.mm=.o} +OBJS9 = ${OBJS8:.py=.pyc} +OBJS10 = ${OBJS9:.rc=.o} +OBJS11 = ${OBJS10:.S=.o} +OBJS += ${OBJS11:.xpm=.o} + +LIB_OBJS = ${OBJS:.o=.lib.o} +PLUGIN_OBJS = ${OBJS:.o=.plugin.o} + +MO_FILES = ${LOCALES:.po=.mo} + +.SILENT: +.SUFFIXES: +.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm +.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER} + +all: + ${MAKE} pre-all + ${MAKE} subdirs + ${MAKE} depend + ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales + ${MAKE} subdirs-after + ${MAKE} post-all + +pre-all post-all: + +subdirs: ${SUBDIRS} +subdirs-after: ${SUBDIRS_AFTER} + +${SUBDIRS} ${SUBDIRS_AFTER}: + for i in $@; do \ + ${DIR_ENTER}; \ + ${MAKE} || exit $$?; \ + ${DIR_LEAVE}; \ + done + +depend: pre-depend ${SRCS} + regen=0; \ + deps=""; \ + test -f .deps || regen=1; \ + for i in "" ${SRCS}; do \ + case $$i in \ + "") \ + ;; \ + *.c) \ + if test x"${CC_DEPENDS}" = x"yes"; then \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $$i.dep"; \ + fi; \ + ;; \ + *.cc | *.cxx) \ + if test x"${CXX_DEPENDS}" = x"yes"; then \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $$i.dep"; \ + fi; \ + ;; \ + *.m) \ + if test x"${OBJC_DEPENDS}" = x"yes"; then \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $$i.dep"; \ + fi; \ + ;; \ + *.mm) \ + if test x"${OBJCXX_DEPENDS}" = x"yes"; then \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $$i.dep"; \ + fi; \ + ;; \ + *.S) \ + if test x"${AS_DEPENDS}" = x"yes"; then \ + test $$i -nt .deps && regen=1; \ + deps="$$deps $$i.dep"; \ + fi; \ + ;; \ + esac; \ + done; \ + if test x"$$regen" = x"1" -a x"$$deps" != x""; then \ + ${DEPEND_STATUS}; \ + if ${MAKE} $$deps && cat $$deps >.deps; then \ + rm -f $$deps; \ + ${DEPEND_OK}; \ + else \ + :> .deps; \ + touch -t 0001010000 .deps; \ + ${DEPEND_FAILED}; \ + fi; \ + fi + +.c.c.dep: + ${CPP} ${CPPFLAGS} ${CFLAGS} -M $< | \ + sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ + { rm -f $@; false; } + +.cc.cc.dep .cxx.cxx.dep: + ${CPP} ${CPPFLAGS} ${CXXFLAGS} -M $< | \ + sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ + { rm -f $@; false; } + +.m.m.dep: + ${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \ + sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ + { rm -f $@; false; } + +.mm.mm.dep: + ${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \ + sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ + { rm -f $@; false; } + +.S.S.dep: + ${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \ + sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ + { rm -f $@; false; } + +pre-depend: + +${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} + ${LINK_STATUS} + out="$@"; \ + if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi + +${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA} + ${LINK_STATUS} + if test x"${JAR_MANIFEST}" != x""; then \ + if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi \ + else \ + if ${JAR} cf ${JARFILE} ${OBJS} ${OBJS_EXTRA}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi \ + fi + +${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} + ${LINK_STATUS} + out="$@"; \ + objs=""; \ + ars=""; \ + for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \ + case $$i in \ + *.a) \ + ars="$$ars $$i" \ + ;; \ + *.o) \ + objs="$$objs $$i" \ + ;; \ + esac \ + done; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + mkdir -p $$dir; \ + cd $$dir; \ + ${AR} x ../$$i; \ + for j in *.o; do \ + objs="$$objs $$dir/$$j"; \ + done; \ + cd ..; \ + done; \ + if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + done + +${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} + ${LINK_STATUS} + out="$@"; \ + objs=""; \ + ars=""; \ + for i in ${PLUGIN_OBJS}; do \ + case $$i in \ + *.a) \ + ars="$$ars $$i" \ + ;; \ + *.o) \ + objs="$$objs $$i" \ + ;; \ + esac \ + done; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + mkdir -p $$dir; \ + cd $$dir; \ + ${AR} x ../$$i; \ + for j in *.o; do \ + objs="$$objs $$dir/$$j"; \ + done; \ + cd ..; \ + done; \ + if ${LD} -o $@ $$objs ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + done + +${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA} + ${LINK_STATUS} + rm -f $@ + out="$@"; \ + objs=""; \ + ars=""; \ + for i in ${OBJS} ${OBJS_EXTRA}; do \ + case $$i in \ + *.a) \ + ars="$$ars $$i" \ + ;; \ + *.o) \ + objs="$$objs $$i" \ + ;; \ + esac \ + done; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + mkdir -p $$dir; \ + cd $$dir; \ + ${AR} x ../$$i; \ + for j in *.o; do \ + objs="$$objs $$dir/$$j"; \ + done; \ + cd ..; \ + done; \ + if ${AR} cr $@ $$objs && ${RANLIB} $@; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + rm -f $@; \ + fi; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + done + +${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} + ${LINK_STATUS} + rm -f $@ + out="$@"; \ + objs=""; \ + ars=""; \ + for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \ + case $$i in \ + *.a) \ + ars="$$ars $$i" \ + ;; \ + *.o) \ + objs="$$objs $$i" \ + ;; \ + esac \ + done; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + mkdir -p $$dir; \ + cd $$dir; \ + ${AR} x ../$$i; \ + for j in *.o; do \ + objs="$$objs $$dir/$$j"; \ + done; \ + cd ..; \ + done; \ + if ${AR} cr $@ $$objs && ${RANLIB} $@; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + rm -f $@; \ + fi; \ + for i in $$ars; do \ + dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ + rm -fr $$dir; \ + done + +locales: ${MO_FILES} + +.c.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi +.c.lib.o: + ${COMPILE_LIB_STATUS} + in="$<"; \ + out="$@"; \ + if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_LIB_OK}; \ + else \ + ${COMPILE_LIB_FAILED}; \ + fi +.c.plugin.o: + ${COMPILE_PLUGIN_STATUS} + in="$<"; \ + out="$@"; \ + if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_PLUGIN_OK}; \ + else \ + ${COMPILE_PLUGIN_FAILED}; \ + fi + +.cc.o .cxx.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi +.cc.lib.o .cxx.lib.o: + ${COMPILE_LIB_STATUS} + in="$<"; \ + out="$@"; \ + if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_LIB_OK}; \ + else \ + ${COMPILE_LIB_FAILED}; \ + fi +.cc.plugin.o .cxx.plugin.o: + ${COMPILE_PLUGIN_STATUS} + in="$<"; \ + out="$@"; \ + if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_PLUGIN_OK}; \ + else \ + ${COMPILE_PLUGIN_FAILED}; \ + fi + +.d.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if test x"$(basename ${DC})" = x"dmd"; then \ + if ${DC} ${DFLAGS} -c -of$@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi \ + else \ + if ${DC} ${DFLAGS} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi \ + fi + +.erl.beam: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.java.class: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${JAVAC} ${JAVACFLAGS} $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.m.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi +.m.lib.o: + ${COMPILE_LIB_STATUS} + in="$<"; \ + out="$@"; \ + if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_LIB_OK}; \ + else \ + ${COMPILE_LIB_FAILED}; \ + fi +.m.plugin.o: + ${COMPILE_PLUGIN_STATUS} + in="$<"; \ + out="$@"; \ + if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_PLUGIN_OK}; \ + else \ + ${COMPILE_PLUGIN_FAILED}; \ + fi + +.mm.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi +.mm.lib.o: + ${COMPILE_LIB_STATUS} + in="$<"; \ + out="$@"; \ + if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_LIB_OK}; \ + else \ + ${COMPILE_LIB_FAILED}; \ + fi +.mm.plugin.o: + ${COMPILE_PLUGIN_STATUS} + in="$<"; \ + out="$@"; \ + if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_PLUGIN_OK}; \ + else \ + ${COMPILE_PLUGIN_FAILED}; \ + fi + +.po.mo: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${MSGFMT} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.py.pyc: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.rc.o .rc.lib.o .rc.plugin.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.S.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${AS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi +.S.lib.o: + ${COMPILE_LIB_STATUS} + in="$<"; \ + out="$@"; \ + if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_LIB_OK}; \ + else \ + ${COMPILE_LIB_FAILED}; \ + fi +.S.plugin.o: + ${COMPILE_PLUGIN_STATUS} + in="$<"; \ + out="$@"; \ + if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$@} -c -o $@ $<; then \ + ${COMPILE_PLUGIN_OK}; \ + else \ + ${COMPILE_PLUGIN_FAILED}; \ + fi + +.xpm.o: + ${COMPILE_STATUS} + in="$<"; \ + out="$@"; \ + if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi +.xpm.lib.o: + ${COMPILE_LIB_STATUS} + in="$<"; \ + out="$@"; \ + if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \ + ${COMPILE_LIB_OK}; \ + else \ + ${COMPILE_LIB_FAILED}; \ + fi +.xpm.plugin.o: + ${COMPILE_PLUGIN_STATUS} + in="$<"; \ + out="$@"; \ + if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$@} -x c -c -o $@ $<; then \ + ${COMPILE_PLUGIN_OK}; \ + else \ + ${COMPILE_PLUGIN_FAILED}; \ + fi + +install: all install-extra + for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ + test x"$$i" = x"" && continue; \ + ${DIR_ENTER}; \ + ${MAKE} install || exit $$?; \ + ${DIR_LEAVE}; \ + done + + for i in "" ${SHARED_LIB}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in "" ${STATIC_LIB} ${STATIC_PIC_LIB}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in "" ${PLUGIN}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in "" ${DATA}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in "" ${PROG}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in "" ${INCLUDES}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in "" ${MO_FILES}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES && ${INSTALL} -m 644 $$i ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in "" ${MAN}; do \ + test x"$$i" = x"" && continue; \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + +install-extra: + +uninstall: uninstall-extra + for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ + test x"$$i" = x"" && continue; \ + ${DIR_ENTER}; \ + ${MAKE} uninstall || exit $$?; \ + ${DIR_LEAVE}; \ + done + + for i in "" ${SHARED_LIB}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${libdir}/$$i; then \ + if : ${UNINSTALL_LIB}; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi; \ + done + + for i in "" ${STATIC_LIB} ${STATIC_PIC_LIB}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${libdir}/$$i; then \ + if rm -f ${DESTDIR}${libdir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + + for i in "" ${PLUGIN}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${plugindir}/$$i; then \ + if rm -f ${DESTDIR}${plugindir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + -rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 + + for i in "" ${DATA}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \ + if rm -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi; \ + rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i)" >/dev/null 2>&1 || true; \ + done + -rmdir ${DESTDIR}${datadir}/${PACKAGE_NAME} >/dev/null 2>&1 + + for i in "" ${PROG}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${bindir}/$$i; then \ + if rm -f ${DESTDIR}${bindir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + + for i in "" ${INCLUDES}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ + if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + -rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1 + + for i in "" ${MO_FILES}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \ + if rm -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + + for i in "" ${MAN}; do \ + test x"$$i" = x"" && continue; \ + if test -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ + if rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + +uninstall-extra: + +clean: + for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ + test x"$$i" = x"" && continue; \ + ${DIR_ENTER}; \ + ${MAKE} clean || exit $$?; \ + ${DIR_LEAVE}; \ + done + + for i in "" ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \ + test x"$$i" = x"" && continue; \ + if test -f $$i -o -d $$i; then \ + if rm -fr $$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + +distclean: clean + for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ + test x"$$i" = x"" && continue; \ + ${DIR_ENTER}; \ + ${MAKE} distclean || exit $$?; \ + ${DIR_LEAVE}; \ + done + + for i in "" ${DISTCLEAN} .deps *~; do \ + test x"$$i" = x"" && continue; \ + if test -f $$i -o -d $$i; then \ + if rm -fr $$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + +print-hierarchy: + for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ + test x"$$i" = x"" && continue; \ + echo ${PRINT_HIERARCHY_PREFIX}$$i; \ + cd $$i || exit $$?; \ + ${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \ + cd .. || exit $$?; \ + done + +print-var: + printf '%s\n' '${${VAR}}' + +DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$? +DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$? +DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r" +DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n" +DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err +COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<" +COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<" +COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err +COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<" +COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<" +COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err +COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<" +COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<" +COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err +LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" +LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" +LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err +INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i" +INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i" +INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err +DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i" +DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err + +.CURDIR ?= . +include ${.CURDIR}/.deps DELETED common/OFDataArray+QByteArray.h Index: common/OFDataArray+QByteArray.h ================================================================== --- common/OFDataArray+QByteArray.h +++ common/OFDataArray+QByteArray.h @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#include - -@interface OFDataArray (QByteArray) -+ (instancetype)dataArrayWithQByteArray: (const QByteArray&)qByteArray; -- (QByteArray)qByteArray; -@end - -namespace ObjQt { - -static OF_INLINE OFDataArray* -toOF(const QByteArray &qByteArray) -{ - return [OFDataArray dataArrayWithQByteArray: qByteArray]; -} - -static OF_INLINE QByteArray -toQt(OFDataArray *dataArray) -{ - return [dataArray qByteArray]; -} - -} DELETED common/OFDataArray+QByteArray.mm Index: common/OFDataArray+QByteArray.mm ================================================================== --- common/OFDataArray+QByteArray.mm +++ common/OFDataArray+QByteArray.mm @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "OFDataArray+QByteArray.h" - -@implementation OFDataArray (QByteArray) -+ (instancetype)dataArrayWithQByteArray: (const QByteArray&)qByteArray -{ - OFDataArray *ret = [OFDataArray dataArray]; - [ret addItems: qByteArray.data() - count: qByteArray.count()]; - - return ret; -} - -- (QByteArray)qByteArray -{ - return QByteArray((char*)[self items], [self count] * [self itemSize]); -} -@end DELETED common/OFString+QString.h Index: common/OFString+QString.h ================================================================== --- common/OFString+QString.h +++ common/OFString+QString.h @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#include - -@interface OFString (QString) -+ (instancetype)stringWithQString: (const QString&)qString; -- initWithQString: (const QString&)qString; -- (QString)qString; -@end - -namespace ObjQt { - -static OF_INLINE OFString* -toOF(const QString &qString) -{ - return [OFString stringWithQString: qString]; -} - -static OF_INLINE QString -toQt(OFString *string) -{ - return [string qString]; -} - -} DELETED common/OFString+QString.mm Index: common/OFString+QString.mm ================================================================== --- common/OFString+QString.mm +++ common/OFString+QString.mm @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import "OFString+QString.h" - -@implementation OFString (QString) -+ stringWithQString: (const QString&)qString -{ - return [[[self alloc] initWithQString: qString] autorelease]; -} - -- initWithQString: (const QString&)qString -{ - static_assert(sizeof(QChar) == sizeof(of_char16_t), - "QChar and of_char16_t have a different size!"); - - return [self initWithUTF16String: (of_char16_t*)qString.data() - length: qString.length()]; -} - -- (QString)qString -{ - static_assert(sizeof(of_char16_t) == sizeof(QChar), - "of_char16_t and QChar have a different size!"); - - void *pool = objc_autoreleasePoolPush(); - QString ret = QString((QChar*)[self UTF16String]); - - objc_autoreleasePoolPop(pool); - - return ret; -} -@end DELETED common/QtOwnershipManaging.h Index: common/QtOwnershipManaging.h ================================================================== --- common/QtOwnershipManaging.h +++ common/QtOwnershipManaging.h @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -@protocol QtOwnershipManaging -- (void)takeOwnership; -- (void)giveUpOwnership; -@end DELETED common/helpers.h Index: common/helpers.h ================================================================== --- common/helpers.h +++ common/helpers.h @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2017, Jonathan Schleifer - * - * https://heap.zone/git/objqt.git - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice is present in all copies. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#import - -#include -#include - -#import "QtObject.h" -#import "QtAction.h" -#import "QtEvent.h" -#import "QtChildEvent.h" -#import "QtThread.h" -#import "QtWidget.h" - -namespace ObjQt { - -static OF_INLINE of_point_t -toOF(const QPoint &qPoint) -{ - return of_point(qPoint.x(), qPoint.y()); -} - -static OF_INLINE QPoint -toQt(of_point_t point) -{ - return QPoint(point.x, point.y); -} - -static OF_INLINE of_dimension_t -toOF(const QSize &qSize) -{ - return of_dimension(qSize.width(), qSize.height()); -} - -static OF_INLINE QSize -toQt(of_dimension_t dimension) -{ - return QSize(dimension.width, dimension.height); -} - -static OF_INLINE of_rectangle_t -toOF(const QRect &qRect) -{ - return of_rectangle(qRect.x(), qRect.y(), - qRect.width(), qRect.height()); -} - -static OF_INLINE QRect -toQt(of_rectangle_t rectangle) -{ - return QRect(rectangle.origin.x, rectangle.origin.y, - rectangle.size.width, rectangle.size.height); -} - -} ADDED configure.ac Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -0,0 +1,102 @@ +AC_INIT(ObjQt, 0.1, js@heap.zone) +BUILDSYS_INIT + +AS_IF([test configure.ac -nt configure], [ + AC_MSG_ERROR([configure.ac is newer than configure! Run autoreconf!]) +]) + +AC_CONFIG_SRCDIR(src) +AC_CONFIG_AUX_DIR(build-aux) +AC_CONFIG_MACRO_DIR(build-aux/m4) + +AC_CHECK_TOOL(OBJFW_CONFIG, objfw-config) +AS_IF([test x"$OBJFW_CONFIG" = x""], [ + AC_MSG_ERROR(You need ObjFW and objfw-config installed!) +]) + +AC_LANG([Objective C++]) +AC_PROG_OBJCXX(clang++ g++) +AC_PROG_OBJCXXCPP +AC_PROG_LN_S +AC_PROG_INSTALL + +CPP="$OBJCXXCPP" +CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)" +OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)" +LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)" +LIBS="$LIBS $($OBJFW_CONFIG --libs)" + +AX_CHECK_COMPILER_FLAGS(-std=c++11, [CXXFLAGS="$CXXFLAGS -std=c++11"], [ + AC_MSG_ERROR(You need a compiler that supports C++11!) +]) + +AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCFLAGS="$OBJCFLAGS -pipe"]) +AX_CHECK_COMPILER_FLAGS(-fno-common, [OBJCFLAGS="$OBJCFLAGS -fno-common"]) +AX_CHECK_COMPILER_FLAGS(-Wobjc-missing-property-synthesis -Werror, + [OBJCFLAGS="$OBJCFLAGS -Wobjc-missing-property-synthesis"]) + +AC_CHECK_TOOL(AR, ar) +AC_PROG_RANLIB +AC_ARG_ENABLE(shared, + AS_HELP_STRING([--disable-shared], [do not build shared library])) +AS_IF([test x"$enable_shared" != x"no"], [ + BUILDSYS_SHARED_LIB + AC_SUBST(OBJQT_SHARED_LIB, "${LIB_PREFIX}objqt${LIB_SUFFIX}") + AC_SUBST(QTCORE_LIB_A, "QtCore.lib.a") + AC_SUBST(QTCORE_QTCORE_LIB_A, "QtCore/QtCore.lib.a") + AC_SUBST(QTGUI_LIB_A, "QtGui.lib.a") + AC_SUBST(QTGUI_QTGUI_LIB_A, "QtGui/QtGui.lib.a") + AC_SUBST(QTWIDGETS_LIB_A, "QtWidgets.lib.a") + AC_SUBST(QTWIDGETS_QTWIDGETS_LIB_A, "QtWidgets/QtWidgets.lib.a") + AC_SUBST(COMMON_COMMON_LIB_A, "common/common.lib.a") + AC_SUBST(COMMON_LIB_A, "common.lib.a") +]) +AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library])) +AS_IF([test x"$enable_static" = x"yes" -o x"$enable_shared" = x"no"], [ + AC_PROG_RANLIB + AC_SUBST(OBJQT_STATIC_LIB, "libobjqt.a") + AC_SUBST(QTCORE_A, "QtCore.a") + AC_SUBST(QTCORE_QTCORE_A, "QtCore/QtCore.a") + AC_SUBST(QTGUI_A, "QtGui.a") + AC_SUBST(QTGUI_QTGUI_A, "QtGui/QtGui.a") + AC_SUBST(QTWIDGETS_A, "QtWidgets.a") + AC_SUBST(QTWIDGETS_QTWIDGETS_A, "QtWidgets/QtWidgets.a") + AC_SUBST(COMMON_COMMON_A, "common/common.a") + AC_SUBST(COMMON_A, "common.a") +]) + +PKG_CHECK_MODULES(Qt5Core, [Qt5Core >= 5.5], [ + CPPFLAGS="$CPPFLAGS $Qt5Core_CFLAGS" + LIBS="$LIBS $Qt5Core_LIBS" +], [ + AC_MSG_ERROR(You need Qt5Core >= 5.5 installed!) +]) + +PKG_CHECK_MODULES(Qt5Gui, [Qt5Gui >= 5.5], [ + CPPFLAGS="$CPPFLAGS $Qt5Gui_CFLAGS" + LIBS="$LIBS $Qt5Gui_LIBS" +], [ + AC_MSG_ERROR(You need Qt5Gui >= 5.5 installed!) +]) +PKG_CHECK_MODULES(Qt5Widgets, [Qt5Widgets >= 5.5], [ + CPPFLAGS="$CPPFLAGS $Qt5Widgets_CFLAGS" + LIBS="$LIBS $Qt5Widgets_LIBS" +], [ + AC_MSG_ERROR(You need Qt5Widgets >= 5.5 installed!) +]) +AS_IF([test x"$GOBJC" = x"yes"], [ + OBJCFLAGS="$OBJCFLAGS -Wwrite-strings -Wpointer-arith -Werror" +]) + +BUILDSYS_INIT + +dnl We don't call AC_PROG_CPP or AC_PROG_OBJC, but only AC_PROG_OBJCPPCXX and +dnl set CPP and OBJCC to OBJCPPCXX and add OBJCXXCPPFLAGS to CPPFLAGS, thus we +dnl need to AC_SUBST these ourself. +AC_SUBST(CPP) +AC_SUBST(CPPFLAGS) +AC_SUBST(CXXFLAGS) +AC_SUBST(OBJCFLAGS) + +AC_CONFIG_FILES([buildsys.mk extra.mk]) +AC_OUTPUT ADDED extra.mk.in Index: extra.mk.in ================================================================== --- extra.mk.in +++ extra.mk.in @@ -0,0 +1,18 @@ +COMMON_A = @COMMON_A@ +COMMON_COMMON_A = @COMMON_COMMON_A@ +COMMON_COMMON_LIB_A = @COMMON_COMMON_LIB_A@ +COMMON_LIB_A = @COMMON_LIB_A@ +OBJQT_SHARED_LIB = @OBJQT_SHARED_LIB@ +OBJQT_STATIC_LIB = @OBJQT_STATIC_LIB@ +QTCORE_A = @QTCORE_A@ +QTCORE_LIB_A = @QTCORE_LIB_A@ +QTCORE_QTCORE_A = @QTCORE_QTCORE_A@ +QTCORE_QTCORE_LIB_A = @QTCORE_QTCORE_LIB_A@ +QTGUI_A = @QTGUI_A@ +QTGUI_LIB_A = @QTGUI_LIB_A@ +QTGUI_QTGUI_A = @QTGUI_QTGUI_A@ +QTGUI_QTGUI_LIB_A = @QTGUI_QTGUI_LIB_A@ +QTWIDGETS_A = @QTWIDGETS_A@ +QTWIDGETS_LIB_A = @QTWIDGETS_LIB_A@ +QTWIDGETS_QTWIDGETS_A = @QTWIDGETS_QTWIDGETS_A@ +QTWIDGETS_QTWIDGETS_LIB_A = @QTWIDGETS_QTWIDGETS_LIB_A@ ADDED src/Makefile Index: src/Makefile ================================================================== --- src/Makefile +++ src/Makefile @@ -0,0 +1,24 @@ +include ../extra.mk + +SUBDIRS = QtCore \ + QtGui \ + QtWidgets \ + common + +SHARED_LIB = ${OBJQT_SHARED_LIB} +STATIC_LIB = ${OBJQT_STATIC_LIB} +LIB_MAJOR = 0 +LIB_MINOR = 0 + +OBJS_EXTRA = ${QTCORE_QTCORE_A} \ + ${QTGUI_QTGUI_A} \ + ${QTWIDGETS_QTWIDGETS_A} \ + ${COMMON_COMMON_A} +LIB_OBJS_EXTRA = ${QTCORE_QTCORE_LIB_A} \ + ${QTGUI_QTGUI_LIB_A} \ + ${QTWIDGETS_QTWIDGETS_LIB_A} \ + ${COMMON_COMMON_LIB_A} + +include ../buildsys.mk + +LD = ${OBJCXX} ADDED src/QtCore/Makefile Index: src/QtCore/Makefile ================================================================== --- src/QtCore/Makefile +++ src/QtCore/Makefile @@ -0,0 +1,14 @@ +include ../../extra.mk + +STATIC_PIC_LIB_NOINST = ${QTCORE_LIB_A} +STATIC_LIB_NOINST = ${QTCORE_A} + +SRCS = QtChildEvent.mm \ + QtCoreApplication.mm \ + QtEvent.mm \ + QtObject.mm \ + QtThread.mm + +include ../../buildsys.mk + +CPPFLAGS += -I. -I../common ADDED src/QtCore/QtChildEvent.h Index: src/QtCore/QtChildEvent.h ================================================================== --- src/QtCore/QtChildEvent.h +++ src/QtCore/QtChildEvent.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtEvent.h" + +@class QtObject; + +@interface QtChildEvent: QtEvent +@property (readonly) QChildEvent *qChildEvent; +@property (readonly, getter=isAdded) bool added; +@property (readonly, retain) QtObject *child; +@property (readonly, getter=isPolished) bool polished; +@property (readonly, getter=isRemoved) bool removed; + +- initWithQChildEvent: (QChildEvent*)qChildEvent; +- initWithType: (QChildEvent::Type)type + child: (QtObject*)child; +@end + +namespace ObjQt { + +static OF_INLINE QtChildEvent* +toOF(QChildEvent *qChildEvent) +{ + return [[[QtChildEvent alloc] + initWithQChildEvent: qChildEvent] autorelease]; +} + +static OF_INLINE QChildEvent* +toQt(QtChildEvent *childEvent) +{ + return [childEvent qChildEvent]; +} + +} ADDED src/QtCore/QtChildEvent.mm Index: src/QtCore/QtChildEvent.mm ================================================================== --- src/QtCore/QtChildEvent.mm +++ src/QtCore/QtChildEvent.mm @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtChildEvent.h" +#import "QtObject.h" + +using ObjQt::toOF; +using ObjQt::toQt; + +@implementation QtChildEvent +- initWithQEvent: (QEvent*)event +{ + OF_INVALID_INIT_METHOD +} + +- initWithQChildEvent: (QChildEvent*)event +{ + return [super initWithQEvent: event]; +} + +- initWithType: (QChildEvent::Type)type + child: (QtObject*)child +{ + try { + self = [self initWithQChildEvent: + new QChildEvent(type, toQt(child))]; + + [self takeOwnership]; + + return self; + } catch (const std::bad_alloc &e) { + self = [super initWithQEvent: NULL]; + [self release]; + throw; + } +} + +- (QChildEvent*)qChildEvent +{ + return dynamic_cast(_qEvent); +} + +- (bool)isAdded +{ + return toQt(self)->added(); +} + +- (QtObject*)child +{ + return toOF(toQt(self)->child()); +} + +- (bool)isPolished +{ + return toQt(self)->polished(); +} + +- (bool)isRemoved +{ + return toQt(self)->removed(); +} +@end ADDED src/QtCore/QtCoreApplication.h Index: src/QtCore/QtCoreApplication.h ================================================================== --- src/QtCore/QtCoreApplication.h +++ src/QtCore/QtCoreApplication.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtObject.h" + +#include + +@interface QtCoreApplication: QtObject +@property (readonly) QCoreApplication *qCoreApplication; +@property (copy) OFString *applicationName, *applicationVersion; +@property (copy) OFString *organizationDomain, *organizationName; +@property (getter=isQuitLockEnabled) bool quitLockEnabled; + +- initWithQCoreApplication: (QCoreApplication*)qCoreApplication; +- (void)installNativeEventFilter: (QAbstractNativeEventFilter*)filterObject; +- (void)quit; +- (void)removeNativeEventFilter: (QAbstractNativeEventFilter*)filterObject; +- (bool)sendEvent: (QtEvent*)event + receiver: (QtObject*)receiver; +@end + +namespace ObjQt { + +static OF_INLINE QtCoreApplication* +toOF(QCoreApplication *qCoreApplication) +{ + return [[[QtCoreApplication alloc] + initWithQCoreApplication: qCoreApplication] autorelease]; +} + +static OF_INLINE QCoreApplication* +toQt(QtCoreApplication *coreApplication) +{ + return [coreApplication qCoreApplication]; +} + +} ADDED src/QtCore/QtCoreApplication.mm Index: src/QtCore/QtCoreApplication.mm ================================================================== --- src/QtCore/QtCoreApplication.mm +++ src/QtCore/QtCoreApplication.mm @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtCoreApplication.h" +#import "QtEvent.h" +#import "OFString+QString.h" + +using ObjQt::toOF; +using ObjQt::toQt; + +@implementation QtCoreApplication +- initWithQObject: (QObject*)qObject +{ + OF_INVALID_INIT_METHOD +} + +- initWithQCoreApplication: (QCoreApplication*)qCoreApplication +{ + return [super initWithQObject: qCoreApplication]; +} + +- (QCoreApplication*)qCoreApplication +{ + return qobject_cast(_qObject); +} + +- (OFString*)applicationName +{ + return toOF(toQt(self)->applicationName()); +} + +- (void)setApplicationName: (OFString*)applicationName +{ + toQt(self)->setApplicationName(toQt(applicationName)); +} + +- (OFString*)applicationVersion +{ + return toOF(toQt(self)->applicationVersion()); +} + +- (void)installNativeEventFilter: (QAbstractNativeEventFilter*)filterObject +{ + toQt(self)->installNativeEventFilter(filterObject); +} + +- (void)setApplicationVersion: (OFString*)applicationVersion +{ + toQt(self)->setApplicationVersion(toQt(applicationVersion)); +} + +- (OFString*)organizationDomain +{ + return toOF(toQt(self)->organizationDomain()); +} + +- (void)setOrganizationDomain: (OFString*)organizationDomain +{ + toQt(self)->setOrganizationDomain(toQt(organizationDomain)); +} + +- (OFString*)organizationName +{ + return toOF(toQt(self)->organizationName()); +} + +- (void)setOrganizationName: (OFString*)organizationName +{ + toQt(self)->setOrganizationName(toQt(organizationName)); +} + +- (void)quit +{ + toQt(self)->quit(); +} + +- (bool)isQuitLockEnabled +{ + return toQt(self)->isQuitLockEnabled(); +} + +- (void)setQuitLockEnabled: (bool)quitLockEnabled +{ + toQt(self)->setQuitLockEnabled(quitLockEnabled); +} + +- (void)removeNativeEventFilter: (QAbstractNativeEventFilter*)filterObject +{ + toQt(self)->removeNativeEventFilter(filterObject); +} + +- (bool)sendEvent: (QtEvent*)event + receiver: (QtObject*)receiver +{ + return toQt(self)->notify(toQt(receiver), toQt(event)); +} +@end ADDED src/QtCore/QtEvent.h Index: src/QtCore/QtEvent.h ================================================================== --- src/QtCore/QtEvent.h +++ src/QtCore/QtEvent.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +#import "QtOwnershipManaging.h" + +#include + +@interface QtEvent: OFObject +{ + QEvent *_qEvent; + bool _ownsEvent; +} + +@property (readonly) QEvent *qEvent; +@property (getter=isAccepted) bool accepted; +@property (readonly, getter=isSpontaneous) bool spontaneous; +@property (readonly) QEvent::Type type; + ++ (int)registerEventType: (int)hint; +- initWithQEvent: (QEvent*)qEvent; +- (void)accept; +- (void)ignore; +@end + +namespace ObjQt { + +static OF_INLINE QtEvent* +toOF(QEvent *qEvent) +{ + return [[[QtEvent alloc] initWithQEvent: qEvent] autorelease]; +} + +static OF_INLINE QEvent* +toQt(QtEvent *event) +{ + return [event qEvent]; +} + +} ADDED src/QtCore/QtEvent.mm Index: src/QtCore/QtEvent.mm ================================================================== --- src/QtCore/QtEvent.mm +++ src/QtCore/QtEvent.mm @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtEvent.h" + +@implementation QtEvent +@synthesize qEvent = _qEvent; + ++ (int)registerEventType: (int)hint +{ + return QEvent::registerEventType(hint); +} + +- init +{ + OF_INVALID_INIT_METHOD +} + +- initWithQEvent: (QEvent*)qEvent +{ + self = [super init]; + + _qEvent = qEvent; + + return self; +} + +- (void)dealloc +{ + if (_ownsEvent) + delete _qEvent; + + [super dealloc]; +} + +- (void)takeOwnership +{ + OF_ENSURE(!_ownsEvent); + _ownsEvent = true; +} + +- (void)giveUpOwnership +{ + OF_ENSURE(_ownsEvent); + _ownsEvent = false; +} + +- (void)accept +{ + _qEvent->accept(); +} + +- (void)ignore +{ + _qEvent->ignore(); +} + +- (bool)isAccepted +{ + return _qEvent->isAccepted(); +} + +- (void)setAccepted: (bool)accepted +{ + _qEvent->setAccepted(accepted); +} + +- (bool)isSpontaneous +{ + return _qEvent->spontaneous(); +} + +- (QEvent::Type)type +{ + return _qEvent->type(); +} +@end ADDED src/QtCore/QtObject.h Index: src/QtCore/QtObject.h ================================================================== --- src/QtCore/QtObject.h +++ src/QtCore/QtObject.h @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +#import "QtOwnershipManaging.h" + +#include + +@class QtEvent; +@class QtThread; + +@interface QtObject: OFObject +{ + QObject *_qObject; + bool _ownsObject; +} + +@property (readonly) QObject *qObject; +@property (readonly) const QMetaObject *metaObject; +@property (retain) QtObject *parent; +@property (copy) OFString *objectName; + +- initWithQObject: (QObject*)qObject; +- (bool)setBlockSignals: (bool)block; +- (OFArray OF_GENERIC(QtObject*)*)children; +- (QMetaObject::Connection)connectSignal: (OFString*)signal + sender: (QtObject*)sender + method: (OFString*)method + type: (Qt::ConnectionType)type; +- (bool)disconnectSignal: (OFString*)signal + receiver: (QtObject*)receiver + method: (OFString*)method; +- (bool)disconnectAllSignalsForReceiver: (QtObject*)receiver + method: (OFString*)method; +- (void)dumpObjectInfo; +- (void)dumpObjectTree; +- (OFArray OF_GENERIC(OFDataArray*)*)dynamicPropertyNames; +- (bool)handleEvent: (QtEvent*)event; +- (bool)filterEvent: (QtEvent*)event + forObject: (QtObject*)watched; +// MISSING: T findChild(const QString &name = QString(), +// Qt::FindChildOptions options = Qt::FindChildrenRecursively) const; +// MISSING QList findChildren(const QString &name = QString(), +// Qt::FindChildOptions options = Qt::FindChildrenRecursively) const; +// MISSING: QList findChildren(const QRegExp ®Exp, +// Qt::FindChildOptions options = Qt::FindChildrenRecursively) const; +- (bool)inheritsClassWithName: (OFString*)className; +- (void)installEventFilter: (QtObject*)filterObj; +- (bool)isWidgetType; +- (bool)isWindowType; +- (void)killTimerWithID: (int)ID; +- (void)moveToThread: (QtThread*)targetThread; +- (QVariant)propertyForName: (OFString*)name; +- (void)removeEventFilter: (QtObject*)obj; +- (bool)setProperty: (QVariant&)value + forName: (OFString*)name; +- (bool)signalsBlocked; +- (int)startTimerWithInterval: (int)interval + type: (Qt::TimerType)type; +- (QtThread*)thread; +- (void)deleteLater; +@end + +namespace ObjQt { + +static OF_INLINE QtObject* +toOF(QObject *qObject) +{ + return [[[QtObject alloc] initWithQObject: qObject] autorelease]; +} + +static OF_INLINE QObject* +toQt(QtObject *object) +{ + return [object qObject]; +} + +} ADDED src/QtCore/QtObject.mm Index: src/QtCore/QtObject.mm ================================================================== --- src/QtCore/QtObject.mm +++ src/QtCore/QtObject.mm @@ -0,0 +1,247 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtObject.h" +#import "QtEvent.h" +#import "QtThread.h" +#import "OFString+QString.h" +#import "OFDataArray+QByteArray.h" + +#include + +using ObjQt::toOF; +using ObjQt::toQt; + +@implementation QtObject +@synthesize qObject = _qObject; + +- init +{ + OF_INVALID_INIT_METHOD +} + +- initWithQObject: (QObject*)qObject +{ + self = [super init]; + + _qObject = qObject; + + return self; +} + +- (void)dealloc +{ + if (_ownsObject) + delete _qObject; + + [super dealloc]; +} + +- (void)takeOwnership +{ + OF_ENSURE(!_ownsObject); + _ownsObject = true; +} + +- (void)giveUpOwnership +{ + OF_ENSURE(_ownsObject); + _ownsObject = false; +} + +- (OFString*)objectName +{ + return toOF(_qObject->objectName()); +} + +- (void)setObjectName: (OFString*)objectName +{ + _qObject->setObjectName(toQt(objectName)); +} + +- (bool)setBlockSignals: (bool)block +{ + return _qObject->blockSignals(block); +} + +- (OFArray OF_GENERIC(QtObject*)*)children +{ + const QObjectList &qChildren = _qObject->children(); + OFMutableArray *children = [OFMutableArray arrayWithCapacity: + qChildren.count()]; + void *pool = objc_autoreleasePoolPush(); + + for (QObject *qChild: qChildren) + [children addObject: toOF(qChild)]; + + [children makeImmutable]; + + objc_autoreleasePoolPop(pool); + + return children; +} + +- (QMetaObject::Connection)connectSignal: (OFString*)signal + sender: (QtObject*)sender + method: (OFString*)method + type: (Qt::ConnectionType)type +{ + return _qObject->connect(toQt(sender), + [signal UTF8String], [method UTF8String], type); +} + +- (bool)disconnectSignal: (OFString*)signal + receiver: (QtObject*)receiver + method: (OFString*)method +{ + return _qObject->disconnect([signal UTF8String], toQt(receiver), + [method UTF8String]); +} + +- (bool)disconnectAllSignalsForReceiver: (QtObject*)receiver + method: (OFString*)method +{ + return _qObject->disconnect(toQt(receiver), [method UTF8String]); +} + +- (void)dumpObjectInfo +{ + _qObject->dumpObjectInfo(); +} + +- (void)dumpObjectTree +{ + _qObject->dumpObjectTree(); +} + +- (OFArray OF_GENERIC(OFDataArray*)*)dynamicPropertyNames +{ + const QList &dynamicPropertyNames = + _qObject->dynamicPropertyNames(); + OFMutableArray *ret = + [OFMutableArray arrayWithCapacity: dynamicPropertyNames.count()]; + void *pool = objc_autoreleasePoolPush(); + + for (const QByteArray &dynamicPropertyName: dynamicPropertyNames) + [ret addObject: toOF(dynamicPropertyName)]; + + [ret makeImmutable]; + + objc_autoreleasePoolPop(pool); + + return ret; +} + +- (bool)handleEvent: (QtEvent*)event +{ + return _qObject->event(toQt(event)); +} + +- (bool)filterEvent: (QtEvent*)event + forObject: (QtObject*)watched +{ + return _qObject->eventFilter(toQt(watched), toQt(event)); +} + +- (bool)inheritsClassWithName: (OFString*)className +{ + return _qObject->inherits([className UTF8String]); +} + +- (void)installEventFilter: (QtObject*)filterObj +{ + _qObject->installEventFilter(toQt(filterObj)); +} + +- (bool)isWidgetType +{ + return _qObject->isWidgetType(); +} + +- (bool)isWindowType +{ + return _qObject->isWindowType(); +} + +- (void)killTimerWithID: (int)ID +{ + _qObject->killTimer(ID); +} + +- (const QMetaObject*)metaObject +{ + return _qObject->metaObject(); +} + +- (void)moveToThread: (QtThread*)targetThread +{ + _qObject->moveToThread(toQt(targetThread)); +} + +- (QtObject*)parent +{ + return toOF(_qObject->parent()); +} + +- (void)setParent: (QtObject*)parent +{ + _qObject->setParent(toQt(parent)); +} + +- (QVariant)propertyForName: (OFString*)name +{ + return _qObject->property([name UTF8String]); +} + +- (void)removeEventFilter: (QtObject*)obj +{ + _qObject->removeEventFilter(toQt(obj)); +} + +- (bool)setProperty: (QVariant&)value + forName: (OFString*)name +{ + return _qObject->setProperty([name UTF8String], value); +} + +- (bool)signalsBlocked +{ + return _qObject->signalsBlocked(); +} + +- (int)startTimerWithInterval: (int)interval + type: (Qt::TimerType)type +{ + return _qObject->startTimer(interval, type); +} + +- (QtThread*)thread +{ + return toOF(_qObject->thread()); +} + +- (void)deleteLater +{ + OF_ENSURE(!_ownsObject); + _qObject->deleteLater(); +} +@end ADDED src/QtCore/QtThread.h Index: src/QtCore/QtThread.h ================================================================== --- src/QtCore/QtThread.h +++ src/QtCore/QtThread.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtObject.h" + +#include + +@interface QtThread: QtObject +@property (readonly) QThread *qThread; +@property QAbstractEventDispatcher *eventDispatcher; +@property (readonly, getter=isFinished) bool finished; +@property (readonly, getter=isInterruptionRequested) bool interruptionRequested; +@property (readonly, getter=isRunning) bool running; +@property (readonly) int loopLevel; +@property QThread::Priority priority; +@property unsigned int stackSize; + +- initWithQThread: (QThread*)qThread; +- (void)exitWithReturnCode: (int)returnCode; +- (void)requestInterruption; +- (bool)waitForMilliseconds: (unsigned long)time; +- (void)quit; +- (void)startWithPriority: (QThread::Priority)priority; +- (void)terminate; +@end + +namespace ObjQt { + +static OF_INLINE QtThread* +toOF(QThread *qThread) +{ + return [[[QtThread alloc] initWithQThread: qThread] autorelease]; +} + +static OF_INLINE QThread* +toQt(QtThread *thread) +{ + return [thread qThread]; +} + +} ADDED src/QtCore/QtThread.mm Index: src/QtCore/QtThread.mm ================================================================== --- src/QtCore/QtThread.mm +++ src/QtCore/QtThread.mm @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtThread.h" + +using ObjQt::toQt; + +@implementation QtThread: QtObject +- initWithQObject: (QObject*)qObject +{ + OF_INVALID_INIT_METHOD +} + +- initWithQThread: (QThread*)qThread +{ + return [super initWithQObject: qThread]; +} + +- (QThread*)qThread +{ + return qobject_cast(_qObject); +} + +- (QAbstractEventDispatcher*)eventDispatcher +{ + return toQt(self)->eventDispatcher(); +} + +- (void)setEventDispatcher: (QAbstractEventDispatcher*)eventDispatcher +{ + toQt(self)->setEventDispatcher(eventDispatcher); +} + +- (void)exitWithReturnCode: (int)returnCode +{ + toQt(self)->exit(returnCode); +} + +- (bool)isFinished +{ + return toQt(self)->isFinished(); +} + +- (bool)isInterruptionRequested +{ + return toQt(self)->isInterruptionRequested(); +} + +- (bool)isRunning +{ + return toQt(self)->isRunning(); +} + +- (int)loopLevel +{ + return toQt(self)->loopLevel(); +} + +- (QThread::Priority)priority +{ + return toQt(self)->priority(); +} + +- (void)setPriority: (QThread::Priority)priority +{ + toQt(self)->setPriority(priority); +} + +- (void)requestInterruption +{ + toQt(self)->requestInterruption(); +} + +- (unsigned int)stackSize +{ + return toQt(self)->stackSize(); +} + +- (void)setStackSize: (unsigned int)stackSize +{ + toQt(self)->setStackSize(stackSize); +} + +- (bool)waitForMilliseconds: (unsigned long)time +{ + return toQt(self)->wait(time); +} + +- (void)quit +{ + toQt(self)->quit(); +} + +- (void)startWithPriority: (QThread::Priority)priority +{ + toQt(self)->start(priority); +} + +- (void)terminate +{ + toQt(self)->terminate(); +} +@end ADDED src/QtGui/Makefile Index: src/QtGui/Makefile ================================================================== --- src/QtGui/Makefile +++ src/QtGui/Makefile @@ -0,0 +1,11 @@ +include ../../extra.mk + +STATIC_PIC_LIB_NOINST = ${QTGUI_LIB_A} +STATIC_LIB_NOINST = ${QTGUI_A} + +SRCS = QtGUIApplication.mm \ + QtPaintDevice.mm + +include ../../buildsys.mk + +CPPFLAGS += -I. -I../QtCore -I../common ADDED src/QtGui/QtGUIApplication.h Index: src/QtGui/QtGUIApplication.h ================================================================== --- src/QtGui/QtGUIApplication.h +++ src/QtGui/QtGUIApplication.h @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtCoreApplication.h" + +#include + +@interface QtGUIApplication: QtCoreApplication +@property (readonly) QGuiApplication *qGuiApplication; +@property (copy) OFString *applicationDisplayName; +#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) +@property (copy) OFString *desktopFileName; +#endif +@property Qt::LayoutDirection layoutDirection; +@property (readonly, copy) OFString *platformName; +@property (readonly) QScreen *primaryScreen; +@property bool quitsOnLastWindowClosed; +@property QIcon windowIcon; + +- initWithQGuiApplication: (QGuiApplication*)qGuiApplication; +- (double)devicePixelRatio; +- (bool)isSavingSession; +- (bool)isSessionRestored; +- (OFString*)sessionID; +- (OFString*)sessionKey; +@end + +namespace ObjQt { + +static OF_INLINE QtGUIApplication* +toOF(QGuiApplication *qGuiApplication) +{ + return [[[QtGUIApplication alloc] + initWithQGuiApplication: qGuiApplication] autorelease]; +} + +static OF_INLINE QGuiApplication* +toQt(QtGUIApplication *GUIApplication) +{ + return [GUIApplication qGuiApplication]; +} + +} ADDED src/QtGui/QtGUIApplication.mm Index: src/QtGui/QtGUIApplication.mm ================================================================== --- src/QtGui/QtGUIApplication.mm +++ src/QtGui/QtGUIApplication.mm @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtGUIApplication.h" +#import "OFString+QString.h" + +#include + +using ObjQt::toOF; +using ObjQt::toQt; + +@implementation QtGUIApplication +- initWithQCoreApplication: (QCoreApplication*)qCoreApplication +{ + OF_INVALID_INIT_METHOD +} + +- initWithQGuiApplication: (QGuiApplication*)qGuiApplication +{ + return [super initWithQCoreApplication: qGuiApplication]; +} + +- (QGuiApplication*)qGuiApplication +{ + return qobject_cast(_qObject); +} + +- (OFString*)applicationDisplayName +{ + return toOF(toQt(self)->applicationDisplayName()); +} + +- (void)setApplicationDisplayName: (OFString*)applicationDisplayName +{ + toQt(self)->setApplicationDisplayName(toQt(applicationDisplayName)); +} + +#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) +- (OFString*)desktopFileName +{ + return toOF(toQt(self)->desktopFileName()); +} + +- (void)setDesktopFileName: (OFString*)desktopFileName +{ + toQt(self)->setDesktopFileName(toQt(desktopFileName)); +} +#endif + +- (double)devicePixelRatio +{ + return toQt(self)->devicePixelRatio(); +} + +- (bool)isSavingSession +{ + return toQt(self)->isSavingSession(); +} + +- (bool)isSessionRestored +{ + return toQt(self)->isSessionRestored(); +} + +- (Qt::LayoutDirection)layoutDirection +{ + return toQt(self)->layoutDirection(); +} + +- (void)setLayoutDirection: (Qt::LayoutDirection)layoutDirection +{ + toQt(self)->setLayoutDirection(layoutDirection); +} + +- (OFString*)platformName +{ + return toOF(toQt(self)->platformName()); +} + +- (QScreen*)primaryScreen +{ + return toQt(self)->primaryScreen(); +} + +- (bool)quitsOnLastWindowClosed +{ + return toQt(self)->quitOnLastWindowClosed(); +} + +- (void)setQuitsOnLastWindowClosed: (bool)quitsOnLastWindowClosed +{ + toQt(self)->setQuitOnLastWindowClosed(quitsOnLastWindowClosed); +} + +- (OFString*)sessionID +{ + return toOF(toQt(self)->sessionId()); +} + +- (OFString*)sessionKey +{ + return toOF(toQt(self)->sessionKey()); +} + +- (QIcon)windowIcon +{ + return toQt(self)->windowIcon(); +} + +- (void)setWindowIcon: (QIcon)windowIcon +{ + toQt(self)->setWindowIcon(windowIcon); +} +@end ADDED src/QtGui/QtPaintDevice.h Index: src/QtGui/QtPaintDevice.h ================================================================== --- src/QtGui/QtPaintDevice.h +++ src/QtGui/QtPaintDevice.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +#include + +@protocol QtPaintDevice +- (QPaintDevice*)qPaintDevice; +- (int)colorCount; +- (int)depth; +- (int)devicePixelRatio; +#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) +- (double)devicePixelRatioF; +#endif +- (int)height; +- (int)heightMM; +- (int)logicalDPIX; +- (int)logicalDPIY; +- (QPaintEngine*)paintEngine; +- (bool)paintingActive; +- (int)physicalDPIX; +- (int)physicalDPIY; +- (int)width; +- (int)widthMM; +@end + +@interface QtPaintDevice: OFObject +@property (readonly) QObject *qObject; +@end + +namespace ObjQt { + +static OF_INLINE QPaintDevice* +toQt(QtPaintDevice *paintDevice) +{ + return [paintDevice qPaintDevice]; +} + +} ADDED src/QtGui/QtPaintDevice.mm Index: src/QtGui/QtPaintDevice.mm ================================================================== --- src/QtGui/QtPaintDevice.mm +++ src/QtGui/QtPaintDevice.mm @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtPaintDevice.h" + +#include + +using ObjQt::toQt; + +@implementation QtPaintDevice +@dynamic qObject; + +- (QPaintDevice*)qPaintDevice +{ + return dynamic_cast([self qObject]); +} + +- (int)colorCount +{ + return toQt(self)->colorCount(); +} + +- (int)depth +{ + return toQt(self)->depth(); +} + +- (int)devicePixelRatio +{ + return toQt(self)->devicePixelRatio(); +} + +#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) +- (double)devicePixelRatioF +{ + return toQt(self)->devicePixelRatioF(); +} +#endif + +- (int)height +{ + return toQt(self)->height(); +} + +- (int)heightMM +{ + return toQt(self)->heightMM(); +} + +- (int)logicalDPIX +{ + return toQt(self)->logicalDpiX(); +} + +- (int)logicalDPIY +{ + return toQt(self)->logicalDpiY(); +} + +- (QPaintEngine*)paintEngine +{ + return toQt(self)->paintEngine(); +} + +- (bool)paintingActive +{ + return toQt(self)->paintingActive(); +} + +- (int)physicalDPIX +{ + return toQt(self)->physicalDpiX(); +} + +- (int)physicalDPIY +{ + return toQt(self)->physicalDpiY(); +} + +- (int)width +{ + return toQt(self)->width(); +} + +- (int)widthMM +{ + return toQt(self)->widthMM(); +} +@end ADDED src/QtWidgets/Makefile Index: src/QtWidgets/Makefile ================================================================== --- src/QtWidgets/Makefile +++ src/QtWidgets/Makefile @@ -0,0 +1,12 @@ +include ../../extra.mk + +STATIC_PIC_LIB_NOINST = ${QTWIDGETS_LIB_A} +STATIC_LIB_NOINST = ${QTWIDGETS_A} + +SRCS = QtAction.mm \ + QtApplication.mm \ + QtWidget.mm + +include ../../buildsys.mk + +CPPFLAGS += -I. -I../QtCore -I../QtGui -I../common ADDED src/QtWidgets/QtAction.h Index: src/QtWidgets/QtAction.h ================================================================== --- src/QtWidgets/QtAction.h +++ src/QtWidgets/QtAction.h @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtObject.h" + +#include + +@class QtWidget; + +@interface QtAction: QtObject +@property (readonly) QAction *qAction; +@property bool autoRepeat; +@property (getter=isCheckable) bool checkable; +@property (getter=isChecked) bool checked; +@property (getter=isEnabled) bool enabled; +@property QFont font; +@property QIcon icon; +@property (copy) OFString *iconText; +@property (getter=isIconVisibleInMenu) bool iconVisibleInMenu; +@property QAction::MenuRole menuRole; +@property QAction::Priority priority; +@property QKeySequence shortcut; +@property Qt::ShortcutContext shortcutContext; +@property (copy) OFString *statusTip; +@property (copy) OFString *text; +@property (copy) OFString *toolTip; +@property (getter=isVisible) bool visible; +@property (copy) OFString *whatsThis; + +- initWithQAction: (QAction*)qAction; +- (QActionGroup*)actionGroup; +- (void)activate: (QAction::ActionEvent)event; +- (QList)associatedGraphicsWidgets; +- (OFArray OF_GENERIC(QtWidget*)*)associatedWidgets; +- (QVariant)data; +- (bool)isSeparator; +- (QMenu*)menu; +- (QtWidget*)parentWidget; +- (void)setActionGroup: (QActionGroup*)group; +- (void)setData: (const QVariant&)data; +- (void)setMenu: (QMenu*)menu; +- (void)setSeparator: (bool)isSeparator; +- (void)setShortcuts: (const QList&)shortcuts; +- (void)setShortcutsWithStandardKey: (QKeySequence::StandardKey)key; +- (QList)shortcuts; +- (bool)showStatusText: (QtWidget*)widget; +@end + +namespace ObjQt { + +static OF_INLINE QtAction* +toOF(QAction *qAction) +{ + return [[[QtAction alloc] initWithQAction: qAction] autorelease]; +} + +static OF_INLINE QAction* +toQt(QtAction *action) +{ + return [action qAction]; +} + +} ADDED src/QtWidgets/QtAction.mm Index: src/QtWidgets/QtAction.mm ================================================================== --- src/QtWidgets/QtAction.mm +++ src/QtWidgets/QtAction.mm @@ -0,0 +1,307 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtAction.h" +#import "QtWidget.h" +#import "OFString+QString.h" + +using ObjQt::toOF; +using ObjQt::toQt; + +@implementation QtAction +- initWithQObject: (QObject*)qObject +{ + OF_INVALID_INIT_METHOD +} + +- initWithQAction: (QAction*)qAction +{ + return [super initWithQObject: qAction]; +} + +- (QAction*)qAction +{ + return qobject_cast(_qObject); +} + +- (bool)autoRepeat +{ + return toQt(self)->autoRepeat(); +} + +- (void)setAutoRepeat: (bool)autoRepeat +{ + toQt(self)->setAutoRepeat(autoRepeat); +} + +- (bool)isCheckable +{ + return toQt(self)->isCheckable(); +} + +- (void)setCheckable: (bool)checkable +{ + toQt(self)->setCheckable(checkable); +} + +- (bool)isChecked +{ + return toQt(self)->isChecked(); +} + +- (void)setChecked: (bool)checked +{ + toQt(self)->setChecked(checked); +} + +- (bool)isEnabled +{ + return toQt(self)->isEnabled(); +} + +- (void)setEnabled: (bool)enabled +{ + toQt(self)->setEnabled(enabled); +} + +- (QFont)font +{ + return toQt(self)->font(); +} + +- (void)setFont: (QFont)font +{ + toQt(self)->setFont(font); +} + +- (QIcon)icon +{ + return toQt(self)->icon(); +} + +- (void)setIcon: (QIcon)icon +{ + toQt(self)->setIcon(icon); +} + +- (OFString*)iconText +{ + return toOF(toQt(self)->iconText()); +} + +- (void)setIconText: (OFString*)iconText +{ + toQt(self)->setIconText(toQt(iconText)); +} + +- (bool)isIconVisibleInMenu +{ + return toQt(self)->isIconVisibleInMenu(); +} + +- (void)setIconVisibleInMenu: (bool)iconVisibleInMenu +{ + toQt(self)->setIconVisibleInMenu(iconVisibleInMenu); +} + +- (QAction::MenuRole)menuRole +{ + return toQt(self)->menuRole(); +} + +- (void)setMenuRole: (QAction::MenuRole)menuRole +{ + toQt(self)->setMenuRole(menuRole); +} + +- (QAction::Priority)priority +{ + return toQt(self)->priority(); +} + +- (void)setPriority: (QAction::Priority)priority +{ + toQt(self)->setPriority(priority); +} + +- (QKeySequence)shortcut +{ + return toQt(self)->shortcut(); +} + +- (void)setShortcut: (QKeySequence)shortcut +{ + toQt(self)->setShortcut(shortcut); +} + +- (Qt::ShortcutContext)shortcutContext +{ + return toQt(self)->shortcutContext(); +} + +- (void)setShortcutContext: (Qt::ShortcutContext)shortcutContext +{ + toQt(self)->setShortcutContext(shortcutContext); +} + +- (OFString*)statusTip +{ + return toOF(toQt(self)->statusTip()); +} + +- (void)setStatusTip: (OFString*)statusTip +{ + toQt(self)->setStatusTip(toQt(statusTip)); +} + +- (OFString*)text +{ + return toOF(toQt(self)->text()); +} + +- (void)setText: (OFString*)text +{ + toQt(self)->setText(toQt(text)); +} + +- (OFString*)toolTip +{ + return toOF(toQt(self)->toolTip()); +} + +- (void)setToolTip: (OFString*)toolTip +{ + toQt(self)->setToolTip(toQt(toolTip)); +} + +- (bool)isVisible +{ + return toQt(self)->isVisible(); +} + +- (void)setVisible: (bool)visible +{ + toQt(self)->setVisible(visible); +} + +- (OFString*)whatsThis +{ + return toOF(toQt(self)->whatsThis()); +} + +- (void)setWhatsThis: (OFString*)whatsThis +{ + toQt(self)->setWhatsThis(toQt(whatsThis)); +} + +- (QActionGroup*)actionGroup +{ + return toQt(self)->actionGroup(); +} + +- (void)activate: (QAction::ActionEvent)event +{ + toQt(self)->activate(event); +} + +- (QList)associatedGraphicsWidgets +{ + return toQt(self)->associatedGraphicsWidgets(); +} + +- (OFArray OF_GENERIC(QtWidget*)*)associatedWidgets +{ + const QList &widgets = toQt(self)->associatedWidgets(); + OFMutableArray *ret = + [OFMutableArray arrayWithCapacity: widgets.count()]; + void *pool = objc_autoreleasePoolPush(); + + for (QWidget *widget: widgets) + [ret addObject: toOF(widget)]; + + [ret makeImmutable]; + + objc_autoreleasePoolPop(pool); + + return ret; +} + +- (QVariant)data +{ + return toQt(self)->data(); +} + +- (bool)isSeparator +{ + return toQt(self)->isSeparator(); +} + +- (QMenu*)menu +{ + return toQt(self)->menu(); +} + +- (QtWidget*)parentWidget +{ + return toOF(toQt(self)->parentWidget()); +} + +- (void)setActionGroup: (QActionGroup*)group +{ + toQt(self)->setActionGroup(group); +} + +- (void)setData: (const QVariant&)userData +{ + toQt(self)->setData(userData); +} + +- (void)setMenu: (QMenu*)menu +{ + toQt(self)->setMenu(menu); +} + +- (void)setSeparator: (bool)isSeparator +{ + toQt(self)->setSeparator(isSeparator); +} + +- (void)setShortcuts: (const QList&)shortcuts +{ + toQt(self)->setShortcuts(shortcuts); +} + +- (void)setShortcutsWithStandardKey: (QKeySequence::StandardKey)key +{ + toQt(self)->setShortcuts(key); +} + +- (QList)shortcuts +{ + return toQt(self)->shortcuts(); +} + +- (bool)showStatusText: (QtWidget*)widget +{ + return toQt(self)->showStatusText(toQt(widget)); +} +@end ADDED src/QtWidgets/QtApplication.h Index: src/QtWidgets/QtApplication.h ================================================================== --- src/QtWidgets/QtApplication.h +++ src/QtWidgets/QtApplication.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtGUIApplication.h" + +#include + +@interface QtApplication: QtGUIApplication +@property (readonly) QApplication *qApplication; +@property bool autoSIPEnabled; +@property int cursorFlashTime; +@property int doubleClickInterval; +@property of_dimension_t globalStrut; +@property int keyboardInputInterval; +@property int startDragDistance; +@property int startDragTime; +@property (copy) OFString *styleSheet; +@property int wheelScrollLines; + +- initWithQApplication: (QApplication*)qApplication; +- (void)aboutQt; +- (void)closeAllWindows; +@end + +namespace ObjQt { + +static OF_INLINE QtApplication* +toOF(QApplication *qApplication) +{ + return [[[QtApplication alloc] + initWithQApplication: qApplication] autorelease]; +} + +static OF_INLINE QApplication* +toQt(QtApplication *application) +{ + return [application qApplication]; +} + +} ADDED src/QtWidgets/QtApplication.mm Index: src/QtWidgets/QtApplication.mm ================================================================== --- src/QtWidgets/QtApplication.mm +++ src/QtWidgets/QtApplication.mm @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtApplication.h" +#import "OFString+QString.h" + +#import "helpers.h" + +using ObjQt::toOF; +using ObjQt::toQt; + +@implementation QtApplication +- initWithQGuiApplication: (QGuiApplication*)qGuiApplication +{ + OF_INVALID_INIT_METHOD +} + +- initWithQApplication: (QApplication*)qApplication +{ + return [super initWithQGuiApplication: qApplication]; +} + +- (QApplication*)qApplication +{ + return qobject_cast(_qObject); +} + +- (bool)autoSIPEnabled +{ + return toQt(self)->autoSipEnabled(); +} + +- (void)setAutoSIPEnabled: (bool)autoSIPEnabled +{ + toQt(self)->setAutoSipEnabled(autoSIPEnabled); +} + +- (int)cursorFlashTime +{ + return toQt(self)->cursorFlashTime(); +} + +- (void)setCursorFlashTime: (int)cursorFlashTime +{ + toQt(self)->setCursorFlashTime(cursorFlashTime); +} + +- (int)doubleClickInterval +{ + return toQt(self)->doubleClickInterval(); +} + +- (void)setDoubleClickInterval: (int)doubleClickInterval +{ + toQt(self)->setDoubleClickInterval(doubleClickInterval); +} + +- (of_dimension_t)globalStrut +{ + return toOF(toQt(self)->globalStrut()); +} + +- (void)setGlobalStrut: (of_dimension_t)globalStrut +{ + toQt(self)->setGlobalStrut(toQt(globalStrut)); +} + +- (int)keyboardInputInterval +{ + return toQt(self)->keyboardInputInterval(); +} + +- (void)setKeyboardInputInterval: (int)keyboardInputInterval +{ + toQt(self)->setKeyboardInputInterval(keyboardInputInterval); +} + +- (int)startDragDistance +{ + return toQt(self)->startDragDistance(); +} + +- (void)setStartDragDistance: (int)startDragDistance +{ + toQt(self)->setStartDragDistance(startDragDistance); +} + +- (int)startDragTime +{ + return toQt(self)->startDragTime(); +} + +- (void)setStartDragTime: (int)startDragTime +{ + toQt(self)->setStartDragTime(startDragTime); +} + +- (OFString*)styleSheet +{ + return toOF(toQt(self)->styleSheet()); +} + +- (void)setStyleSheet: (OFString*)styleSheet +{ + toQt(self)->setStyleSheet(toQt(styleSheet)); +} + +- (int)wheelScrollLines +{ + return toQt(self)->wheelScrollLines(); +} + +- (void)setWheelScrollLines: (int)wheelScrollLines +{ + toQt(self)->setWheelScrollLines(wheelScrollLines); +} + +- (void)aboutQt +{ + toQt(self)->aboutQt(); +} + +- (void)closeAllWindows +{ + toQt(self)->closeAllWindows(); +} +@end ADDED src/QtWidgets/QtWidget.h Index: src/QtWidgets/QtWidget.h ================================================================== --- src/QtWidgets/QtWidget.h +++ src/QtWidgets/QtWidget.h @@ -0,0 +1,240 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtObject.h" +#import "QtPaintDevice.h" + +#include + +@class QtAction; + +@interface QtWidget: QtObject +@property (readonly) QWidget *qWidget; +@property bool acceptDrops; +@property (copy) OFString *accessibleDescription; +@property (copy) OFString *accessibleName; +@property bool autoFillBackground; +@property of_dimension_t baseSize; +@property (readonly) of_rectangle_t childrenRect; +@property (readonly) QRegion childrenRegion; +@property Qt::ContextMenuPolicy contextMenuPolicy; +@property QCursor cursor; +@property (getter=isEnabled) bool enabled; +@property Qt::FocusPolicy focusPolicy; +@property const QFont &font; +@property (readonly) of_rectangle_t frameGeometry; +@property (readonly) of_dimension_t frameSize; +@property (readonly, getter=isFullScreen) bool fullScreen; +@property of_rectangle_t geometry; +@property (readonly) int height; +@property Qt::InputMethodHints inputMethodHints; +@property (readonly) bool isActiveWindow; +@property Qt::LayoutDirection layoutDirection; +@property QLocale locale; +@property (readonly, getter=isMaximized) bool maximized; +@property int maximumHeight; +@property of_dimension_t maximumSize; +@property int maximumWidth; +@property (readonly, getter=isMinimized) bool minimized; +@property int minimumHeight; +@property of_dimension_t minimumSize; +@property (readonly) of_dimension_t minimumSizeHint; +@property int minimumWidth; +@property (readonly, getter=isModal) bool modal; +@property (getter=hasMouseTracking) bool mouseTracking; +@property (readonly) of_rectangle_t normalGeometry; +@property const QPalette &palette; +@property (setter=moveToPosition:) of_point_t pos; +@property (readonly) of_rectangle_t rect; +@property (setter=resizeTo:) of_dimension_t size; +@property (readonly) of_dimension_t sizeHint; +@property of_dimension_t sizeIncrement; +@property QSizePolicy sizePolicy; +@property (copy) OFString *statusTip; +@property (copy) OFString *styleSheet; +@property (copy) OFString *toolTip; +@property int toolTipDuration; +@property bool updatesEnabled; +@property (getter=isVisible) bool visible; +@property (copy) OFString *whatsThis; +@property (readonly) int width; +@property Qt::WindowFlags windowFlags; +@property QIcon windowIcon; +@property Qt::WindowModality windowModality; +@property (getter=isWindowModified) bool windowModified; +@property double windowOpacity; +@property (copy) OFString *windowTitle; +@property (readonly) int x; +@property (readonly) int y; + +- initWithQWidget: (QWidget*)qWidget; +- (OFArray OF_GENERIC(QtAction*)*)actions; +- (void)activateWindow; +- (void)addAction: (QtAction*)action; +- (void)addActions: (OFArray OF_GENERIC(QtAction*)*)actions; +- (void)adjustSize; +- (QPalette::ColorRole)backgroundRole; +- (QBackingStore*)backingStore; +- (QtWidget*)childAt: (of_point_t)point; +- (void)clearFocus; +- (void)clearMask; +- (QMargins)contentsMargins; +- (of_rectangle_t)contentsRect; +- (WId)effectiveWinID; +- (void)ensurePolished; +- (QtWidget*)focusProxy; +- (QtWidget*)focusWidget; +- (QFontInfo)fontInfo; +- (QFontMetrics)fontMetrics; +- (QPalette::ColorRole)foregroundRole; +- (QPixmap)grabRectangle: (of_rectangle_t)rectangle; +- (void)grabGesture: (Qt::GestureType)gesture; +- (void)grabGesture: (Qt::GestureType)gesture + flags: (Qt::GestureFlags)flags; +- (void)grabKeyboard; +- (void)grabMouse; +- (void)grabMouseWithCursor: (const QCursor&)cursor; +- (int)grabShortcutWithKey: (const QKeySequence&)key; +- (int)grabShortcutWithKey: (const QKeySequence&)key + context: (Qt::ShortcutContext)context; +- (QGraphicsEffect*)graphicsEffect; +- (QGraphicsProxyWidget*)graphicsProxyWidget; +#ifdef QT_KEYPAD_NAVIGATION +- (bool)hasEditFocus; +#endif +- (bool)hasFocus; +- (bool)hasHeightForWidth; +- (int)heightForWidth: (int)w; +- (QVariant)queryInputMethod: (Qt::InputMethodQuery)query; +- (void)insertAction: (QtAction*)action + before: (QtAction*)before; +- (void)insertActions: (OFArray OF_GENERIC(QtAction*)*)actions + before: (QtAction*)before; +- (bool)isAncestorOf: (QtWidget*)child; +- (bool)isEnabledTo: (QtWidget*)ancestor; +- (bool)isHidden; +- (bool)isVisibleTo: (QtWidget*)ancestor; +- (bool)isWindow; +- (of_point_t)mapPosition: (of_point_t)pos + from: (QtWidget*)parent; +- (of_point_t)mapPositionFromGlobal: (of_point_t)pos; +- (of_point_t)mapPositionFromParent: (of_point_t)pos; +- (of_point_t)mapPosition: (of_point_t)pos + to: (QtWidget*)parent; +- (of_point_t)mapPositionToGlobal: (of_point_t)pos; +- (of_point_t)mapPositionToParent: (of_point_t)pos; +- (QRegion)mask; +- (QtWidget*)nativeParentWidget; +- (QtWidget*)nextInFocusChain; +- (void)overrideWindowFlags: (Qt::WindowFlags)flags; +- (QtWidget*)parentWidget; +- (QtWidget*)previousInFocusChain; +- (void)releaseKeyboard; +- (void)releaseMouse; +- (void)releaseShortcut: (int)ID; +- (void)removeAction: (QtAction*)action; +- (void)renderIntoPaintDevice: (QtObject *)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion; +- (void)renderIntoPaintDevice: (QtObject *)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion + flags: (QWidget::RenderFlags)renderFlags; +- (void)renderIntoPainter: (QPainter*)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion; +- (void)renderIntoPainter: (QPainter*)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion + flags: (QWidget::RenderFlags)renderFlags; +- (void)repaintInRectangle: (of_rectangle_t)rect; +- (void)repaintInRegion: (const QRegion&)region; +- (bool)restoreGeometry: (OFDataArray*)geometry; +- (OFDataArray*)saveGeometry; +- (void)scrollRight: (int)dx + down: (int)dy; +- (void)scrollRight: (int)dx + down: (int)dy + inRectangle: (of_rectangle_t)rect; +- (void)setAttribute: (Qt::WidgetAttribute)attribute + to: (bool)on; +#ifdef QT_KEYPAD_NAVIGATION +- (void)setEditFocus: (bool)enable; +#endif +- (void)setFixedHeight: (int)height; +- (void)setFixedSize: (of_dimension_t)size; +- (void)setFixedWidth: (int)width; +- (void)setFocus: (Qt::FocusReason)reason; +- (void)setFocusProxy: (QtWidget*)widget; +- (void)setForegroundRole: (QPalette::ColorRole)role; +- (void)setGraphicsEffect: (QGraphicsEffect*)effect; +- (void)setLayout: (QLayout*)layout; +- (void)setMaskFromBitmap: (const QBitmap&)bitmap; +- (void)setMask: (const QRegion&)region; +- (void)setParent: (QtWidget*)parent; +- (void)setParent: (QtWidget*)parent + flags: (Qt::WindowFlags)flags; +- (void)setAutoRepeat: (bool)enable + forShortcut: (int)ID; +- (void)setEnabled: (bool)enable + forShortcut: (int)ID; +- (void)setStyle: (QStyle*)style; +- (void)setWindowRole: (OFString*)role; +- (void)setWindowState: (Qt::WindowStates)windowState; +- (void)stackUnder: (QtWidget*)widget; +- (QStyle*)style; +- (bool)testAttribute: (Qt::WidgetAttribute)attribute; +- (bool)isUnderMouse; +- (void)ungrabGesture: (Qt::GestureType)gesture; +- (void)unsetCursor; +- (void)unsetLayoutDirection; +- (void)unsetLocale; +- (void)updateInRectangle: (of_rectangle_t)rect; +- (void)updateInRegion: (const QRegion&)region; +- (void)updateGeometry; +- (QRegion)visibleRegion; +- (WId)winID; +- (QtWidget*)window; +- (QWindow*)windowHandle; +- (OFString*)windowRole; +- (Qt::WindowStates)windowState; +- (Qt::WindowType)windowType; +@end + +@interface QtWidget (QtPaintDevice) +@end + +namespace ObjQt { + +static OF_INLINE QtWidget* +toOF(QWidget *qWidget) +{ + return [[[QtWidget alloc] initWithQWidget: qWidget] autorelease]; +} + +static OF_INLINE QWidget* +toQt(QtWidget *widget) +{ + return [widget qWidget]; +} + +} ADDED src/QtWidgets/QtWidget.mm Index: src/QtWidgets/QtWidget.mm ================================================================== --- src/QtWidgets/QtWidget.mm +++ src/QtWidgets/QtWidget.mm @@ -0,0 +1,1114 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "QtWidget.h" +#import "QtAction.h" +#import "OFString+QString.h" +#import "OFDataArray+QByteArray.h" + +#import "helpers.h" + +#include +#include + +using ObjQt::toOF; +using ObjQt::toQt; + +@implementation QtWidget ++ (void)initialize +{ + if (self == [QtWidget class]) + [self inheritMethodsFromClass: [QtPaintDevice class]]; +} + +- initWithQObject: (QObject*)qObject +{ + OF_INVALID_INIT_METHOD +} + +- initWithQWidget: (QWidget*)qWidget +{ + return [super initWithQObject: qWidget]; +} + +- (QWidget*)qWidget +{ + return qobject_cast(_qObject); +} + +- (bool)acceptDrops +{ + return toQt(self)->acceptDrops(); +} + +- (void)setAcceptDrops: (bool)acceptDrops +{ + toQt(self)->setAcceptDrops(acceptDrops); +} + +- (OFString*)accessibleDescription +{ + return toOF(toQt(self)->accessibleDescription()); +} + +- (void)setAccessibleDescription: (OFString*)accessibleDescription +{ + toQt(self)->setAccessibleDescription(toQt(accessibleDescription)); +} + +- (OFString*)accessibleName +{ + return toOF(toQt(self)->accessibleName()); +} + +- (void)setAccessibleName: (OFString*)accessibleName +{ + toQt(self)->setAccessibleName(toQt(accessibleName)); +} + +- (bool)autoFillBackground +{ + return toQt(self)->autoFillBackground(); +} + +- (void)setAutoFillBackground: (bool)autoFillBackground +{ + toQt(self)->setAutoFillBackground(autoFillBackground); +} + +- (of_dimension_t)baseSize +{ + return toOF(toQt(self)->baseSize()); +} + +- (void)setBaseSize: (of_dimension_t)baseSize +{ + toQt(self)->setBaseSize(toQt(baseSize)); +} + +- (of_rectangle_t)childrenRect +{ + return toOF(toQt(self)->childrenRect()); +} + +- (QRegion)childrenRegion +{ + return toQt(self)->childrenRegion(); +} + +- (Qt::ContextMenuPolicy)contextMenuPolicy +{ + return toQt(self)->contextMenuPolicy(); +} + +- (void)setContextMenuPolicy: (Qt::ContextMenuPolicy)contextMenuPolicy +{ + toQt(self)->setContextMenuPolicy(contextMenuPolicy); +} + +- (QCursor)cursor +{ + return toQt(self)->cursor(); +} + +- (void)setCursor: (QCursor)cursor +{ + toQt(self)->setCursor(cursor); +} + +- (void)unsetCursor +{ + toQt(self)->unsetCursor(); +} + +- (bool)isEnabled +{ + return toQt(self)->isEnabled(); +} + +- (void)setEnabled: (bool)enabled +{ + toQt(self)->setEnabled(enabled); +} + +- (bool)hasFocus +{ + return toQt(self)->hasFocus(); +} + +- (Qt::FocusPolicy)focusPolicy +{ + return toQt(self)->focusPolicy(); +} + +- (void)setFocusPolicy: (Qt::FocusPolicy)focusPolicy +{ + toQt(self)->setFocusPolicy(focusPolicy); +} + +- (const QFont&)font +{ + return toQt(self)->font(); +} + +- (void)setFont: (const QFont&)font +{ + toQt(self)->setFont(font); +} + +- (of_rectangle_t)frameGeometry +{ + return toOF(toQt(self)->frameGeometry()); +} + +- (of_dimension_t)frameSize +{ + return toOF(toQt(self)->frameSize()); +} + +- (bool)isFullScreen +{ + return toQt(self)->isFullScreen(); +} + +- (of_rectangle_t)geometry +{ + return toOF(toQt(self)->geometry()); +} + +- (void)setGeometry: (of_rectangle_t)geometry +{ + toQt(self)->setGeometry(toQt(geometry)); +} + +- (int)height +{ + return toQt(self)->height(); +} + +- (Qt::InputMethodHints)inputMethodHints +{ + return toQt(self)->inputMethodHints(); +} + +- (void)setInputMethodHints: (Qt::InputMethodHints)inputMethodHints +{ + toQt(self)->setInputMethodHints(inputMethodHints); +} + +- (bool)isActiveWindow +{ + return toQt(self)->isActiveWindow(); +} + +- (Qt::LayoutDirection)layoutDirection +{ + return toQt(self)->layoutDirection(); +} + +- (void)setLayoutDirection: (Qt::LayoutDirection)layoutDirection +{ + toQt(self)->setLayoutDirection(layoutDirection); +} + +- (void)unsetLayoutDirection +{ + toQt(self)->unsetLayoutDirection(); +} + +- (QLocale)locale +{ + return toQt(self)->locale(); +} + +- (void)setLocale: (QLocale)locale +{ + toQt(self)->setLocale(locale); +} + +- (void)unsetLocale +{ + toQt(self)->unsetLocale(); +} + +- (bool)isMaximized +{ + return toQt(self)->isMaximized(); +} + +- (int)maximumHeight +{ + return toQt(self)->maximumHeight(); +} + +- (void)setMaximumHeight: (int)maximumHeight +{ + toQt(self)->setMaximumHeight(maximumHeight); +} + +- (of_dimension_t)maximumSize +{ + return toOF(toQt(self)->maximumSize()); +} + +- (void)setMaximumSize: (of_dimension_t)maximumSize +{ + toQt(self)->setMaximumSize(toQt(maximumSize)); +} + +- (int)maximumWidth +{ + return toQt(self)->maximumWidth(); +} + +- (void)setMaximumWidth: (int)maximumWidth +{ + toQt(self)->setMaximumWidth(maximumWidth); +} + +- (bool)isMinimized +{ + return toQt(self)->isMinimized(); +} + +- (int)minimumHeight +{ + return toQt(self)->minimumHeight(); +} + +- (void)setMinimumHeight: (int)minimumHeight +{ + toQt(self)->setMinimumHeight(minimumHeight); +} + +- (of_dimension_t)minimumSize +{ + return toOF(toQt(self)->minimumSize()); +} + +- (void)setMinimumSize: (of_dimension_t)minimumSize +{ + toQt(self)->setMinimumSize(toQt(minimumSize)); +} + +- (of_dimension_t)minimumSizeHint +{ + return toOF(toQt(self)->minimumSizeHint()); +} + +- (int)minimumWidth +{ + return toQt(self)->minimumWidth(); +} + +- (void)setMinimumWidth: (int)minimumWidth +{ + toQt(self)->setMinimumWidth(minimumWidth); +} + +- (bool)isModal +{ + return toQt(self)->isModal(); +} + +- (bool)hasMouseTracking +{ + return toQt(self)->hasMouseTracking(); +} + +- (void)setMouseTracking: (bool)mouseTracking +{ + toQt(self)->setMouseTracking(mouseTracking); +} + +- (of_rectangle_t)normalGeometry +{ + return toOF(toQt(self)->normalGeometry()); +} + +- (const QPalette&)palette +{ + return toQt(self)->palette(); +} + +- (void)setPalette: (const QPalette&)palette +{ + toQt(self)->setPalette(palette); +} + +- (of_point_t)pos +{ + return toOF(toQt(self)->pos()); +} + +- (void)moveToPosition: (of_point_t)pos +{ + toQt(self)->move(toQt(pos)); +} + +- (of_rectangle_t)rect +{ + return toOF(toQt(self)->rect()); +} + +- (of_dimension_t)size +{ + return toOF(toQt(self)->size()); +} + +- (void)resizeTo: (of_dimension_t)size +{ + toQt(self)->resize(toQt(size)); +} + +- (of_dimension_t)sizeHint +{ + return toOF(toQt(self)->sizeHint()); +} + +- (of_dimension_t)sizeIncrement +{ + return toOF(toQt(self)->sizeIncrement()); +} + +- (void)setSizeIncrement: (of_dimension_t)sizeIncrement +{ + toQt(self)->setSizeIncrement(toQt(sizeIncrement)); +} + +- (QSizePolicy)sizePolicy +{ + return toQt(self)->sizePolicy(); +} + +- (void)setSizePolicy: (QSizePolicy)sizePolicy +{ + toQt(self)->setSizePolicy(sizePolicy); +} + +- (OFString*)statusTip +{ + return toOF(toQt(self)->statusTip()); +} + +- (void)setStatusTip: (OFString*)statusTip +{ + toQt(self)->setStatusTip(toQt(statusTip)); +} + +- (OFString*)styleSheet +{ + return toOF(toQt(self)->styleSheet()); +} + +- (void)setStyleSheet: (OFString*)styleSheet +{ + toQt(self)->setStyleSheet(toQt(styleSheet)); +} + +- (OFString*)toolTip +{ + return toOF(toQt(self)->toolTip()); +} + +- (void)setToolTip: (OFString*)toolTip +{ + toQt(self)->setToolTip(toQt(toolTip)); +} + +- (int)toolTipDuration +{ + return toQt(self)->toolTipDuration(); +} + +- (void)setToolTipDuration: (int)toolTipDuration +{ + toQt(self)->setToolTipDuration(toolTipDuration); +} + +- (bool)updatesEnabled +{ + return toQt(self)->updatesEnabled(); +} + +- (void)setUpdatesEnabled: (bool)updatesEnabled +{ + toQt(self)->setUpdatesEnabled(updatesEnabled); +} + +- (bool)isVisible +{ + return toQt(self)->isVisible(); +} + +- (void)setVisible: (bool)visible +{ + toQt(self)->setVisible(visible); +} + +- (OFString*)whatsThis +{ + return toOF(toQt(self)->whatsThis()); +} + +- (void)setWhatsThis: (OFString*)whatsThis +{ + toQt(self)->setWhatsThis(toQt(whatsThis)); +} + +- (int)width +{ + return toQt(self)->width(); +} + +- (OFString*)windowFilePath +{ + return toOF(toQt(self)->windowFilePath()); +} + +- (void)setWindowFilePath: (OFString*)windowFilePath +{ + toQt(self)->setWindowFilePath(toQt(windowFilePath)); +} + +- (Qt::WindowFlags)windowFlags +{ + return toQt(self)->windowFlags(); +} + +- (void)setWindowFlags: (Qt::WindowFlags)windowFlags +{ + toQt(self)->setWindowFlags(windowFlags); +} + +- (QIcon)windowIcon +{ + return toQt(self)->windowIcon(); +} + +- (void)setWindowIcon: (QIcon)windowIcon +{ + toQt(self)->setWindowIcon(windowIcon); +} + +- (Qt::WindowModality)windowModality +{ + return toQt(self)->windowModality(); +} + +- (void)setWindowModality: (Qt::WindowModality)windowModality +{ + toQt(self)->setWindowModality(windowModality); +} + +- (bool)isWindowModified +{ + return toQt(self)->isWindowModified(); +} + +- (void)setWindowModified: (bool)windowModified +{ + toQt(self)->setWindowModified(windowModified); +} + +- (double)windowOpacity +{ + return toQt(self)->windowOpacity(); +} + +- (void)setWindowOpacity: (double)windowOpacity +{ + toQt(self)->setWindowOpacity(windowOpacity); +} + +- (OFString*)windowTitle +{ + return toOF(toQt(self)->windowTitle()); +} + +- (void)setWindowTitle: (OFString*)windowTitle +{ + toQt(self)->setWindowTitle(toQt(windowTitle)); +} + +- (int)x +{ + return toQt(self)->x(); +} + +- (int)y +{ + return toQt(self)->y(); +} + +- (OFArray OF_GENERIC(QtAction*)*)actions +{ + const QList &actions = toQt(self)->actions(); + OFMutableArray *ret = + [OFMutableArray arrayWithCapacity: actions.count()]; + void *pool = objc_autoreleasePoolPush(); + + for (QAction *action: actions) + [ret addObject: toOF(action)]; + + [ret makeImmutable]; + + objc_autoreleasePoolPop(pool); + + return ret; +} + +- (void)activateWindow +{ + toQt(self)->activateWindow(); +} + +- (void)addAction: (QtAction*)action +{ + toQt(self)->addAction(toQt(action)); +} + +- (void)addActions: (OFArray OF_GENERIC(QtAction*)*)actions +{ + QList list; + + for (QtAction *action in actions) + list.append(toQt(action)); + + toQt(self)->addActions(list); +} + +- (void)adjustSize +{ + toQt(self)->adjustSize(); +} + +- (QPalette::ColorRole)backgroundRole +{ + return toQt(self)->backgroundRole(); +} + +- (QBackingStore*)backingStore +{ + return toQt(self)->backingStore(); +} + +- (QtWidget*)childAt: (of_point_t)point +{ + return toOF(toQt(self)->childAt(toQt(point))); +} + +- (void)clearFocus +{ + return toQt(self)->clearFocus(); +} + +- (void)clearMask +{ + toQt(self)->clearMask(); +} + +- (QMargins)contentsMargins +{ + return toQt(self)->contentsMargins(); +} + +- (of_rectangle_t)contentsRect +{ + return toOF(toQt(self)->contentsRect()); +} + +- (WId)effectiveWinID +{ + return toQt(self)->effectiveWinId(); +} + +- (void)ensurePolished +{ + toQt(self)->ensurePolished(); +} + +- (QtWidget*)focusProxy +{ + return toOF(toQt(self)->focusProxy()); +} + +- (QtWidget*)focusWidget +{ + return toOF(toQt(self)->focusWidget()); +} + +- (QFontInfo)fontInfo +{ + return toQt(self)->fontInfo(); +} + +- (QFontMetrics)fontMetrics +{ + return toQt(self)->fontMetrics(); +} + +- (QPalette::ColorRole)foregroundRole +{ + return toQt(self)->foregroundRole(); +} + +- (QPixmap)grabRectangle: (of_rectangle_t)rectangle +{ + return toQt(self)->grab(toQt(rectangle)); +} + +- (void)grabGesture: (Qt::GestureType)gesture +{ + toQt(self)->grabGesture(gesture); +} + +- (void)grabGesture: (Qt::GestureType)gesture + flags: (Qt::GestureFlags)flags +{ + toQt(self)->grabGesture(gesture, flags); +} + +- (void)grabKeyboard +{ + toQt(self)->grabKeyboard(); +} + +- (void)grabMouse +{ + toQt(self)->grabMouse(); +} + +- (void)grabMouseWithCursor: (const QCursor&)cursor +{ + toQt(self)->grabMouse(cursor); +} + +- (int)grabShortcutWithKey: (const QKeySequence&)key +{ + return toQt(self)->grabShortcut(key); +} + +- (int)grabShortcutWithKey: (const QKeySequence&)key + context: (Qt::ShortcutContext)context +{ + return toQt(self)->grabShortcut(key, context); +} + +- (QGraphicsEffect*)graphicsEffect +{ + return toQt(self)->graphicsEffect(); +} + +- (QGraphicsProxyWidget*)graphicsProxyWidget +{ + return toQt(self)->graphicsProxyWidget(); +} + +#ifdef QT_KEYPAD_NAVIGATION +- (bool)hasEditFocus +{ + return toQt(self)->hasEditFocus(); +} +#endif + +- (bool)hasHeightForWidth +{ + return toQt(self)->hasHeightForWidth(); +} + +- (int)heightForWidth: (int)w +{ + return toQt(self)->heightForWidth(w); +} + +- (QVariant)queryInputMethod: (Qt::InputMethodQuery)query +{ + return toQt(self)->inputMethodQuery(query); +} + +- (void)insertAction: (QtAction*)action + before: (QtAction*)before +{ + toQt(self)->insertAction(toQt(before), toQt(action)); +} + +- (void)insertActions: (OFArray OF_GENERIC(QtAction*)*)actions + before: (QtAction*)before +{ + QList list; + + for (QtAction *action in actions) + list.append(toQt(action)); + + toQt(self)->insertActions(toQt(before), list); +} + +- (bool)isAncestorOf: (QtWidget*)child +{ + return toQt(self)->isAncestorOf(toQt(child)); +} + +- (bool)isEnabledTo: (QtWidget*)ancestor +{ + return toQt(self)->isEnabledTo(toQt(ancestor)); +} + +- (bool)isHidden +{ + return toQt(self)->isHidden(); +} + +- (bool)isVisibleTo: (QtWidget*)ancestor +{ + return toQt(self)->isVisibleTo(toQt(ancestor)); +} + +- (bool)isWindow +{ + return toQt(self)->isWindow(); +} + +- (of_point_t)mapPosition: (of_point_t)pos + from: (QtWidget*)parent +{ + return toOF(toQt(self)->mapFrom(toQt(parent), toQt(pos))); +} + +- (of_point_t)mapPositionFromGlobal: (of_point_t)pos +{ + return toOF(toQt(self)->mapFromGlobal(toQt(pos))); +} + +- (of_point_t)mapPositionFromParent: (of_point_t)pos +{ + return toOF(toQt(self)->mapFromParent(toQt(pos))); +} + +- (of_point_t)mapPosition: (of_point_t)pos + to: (QtWidget*)parent +{ + return toOF(toQt(self)->mapTo(toQt(parent), toQt(pos))); +} + +- (of_point_t)mapPositionToGlobal: (of_point_t)pos +{ + return toOF(toQt(self)->mapToGlobal(toQt(pos))); +} + +- (of_point_t)mapPositionToParent: (of_point_t)pos +{ + return toOF(toQt(self)->mapToParent(toQt(pos))); +} + +- (QRegion)mask +{ + return toQt(self)->mask(); +} + +- (QtWidget*)nativeParentWidget +{ + return toOF(toQt(self)->nativeParentWidget()); +} + +- (QtWidget*)nextInFocusChain +{ + return toOF(toQt(self)->nextInFocusChain()); +} + +- (void)overrideWindowFlags: (Qt::WindowFlags)flags +{ + toQt(self)->overrideWindowFlags(flags); +} + +- (QtWidget*)parentWidget +{ + return toOF(toQt(self)->parentWidget()); +} + +- (QtWidget*)previousInFocusChain +{ + return toOF(toQt(self)->previousInFocusChain()); +} + +- (void)releaseKeyboard +{ + toQt(self)->releaseKeyboard(); +} + +- (void)releaseMouse +{ + toQt(self)->releaseMouse(); +} + +- (void)releaseShortcut: (int)ID +{ + toQt(self)->releaseShortcut(ID); +} + +- (void)removeAction: (QtAction*)action +{ + toQt(self)->removeAction(toQt(action)); +} + +- (void)renderIntoPaintDevice: (QtObject *)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion +{ + toQt(self)->render([target qPaintDevice], toQt(targetOffset), + sourceRegion); +} + +- (void)renderIntoPaintDevice: (QtObject *)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion + flags: (QWidget::RenderFlags)renderFlags +{ + toQt(self)->render([target qPaintDevice], toQt(targetOffset), + sourceRegion, renderFlags); +} + +- (void)renderIntoPainter: (QPainter*)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion +{ + toQt(self)->render(target, toQt(targetOffset), sourceRegion); +} + +- (void)renderIntoPainter: (QPainter*)target + targetOffset: (of_point_t)targetOffset + sourceRegion: (QRegion)sourceRegion + flags: (QWidget::RenderFlags)renderFlags +{ + toQt(self)->render(target, toQt(targetOffset), sourceRegion, + renderFlags); +} + +- (void)repaintInRectangle: (of_rectangle_t)rect +{ + toQt(self)->repaint(toQt(rect)); +} + +- (void)repaintInRegion: (const QRegion&)region +{ + toQt(self)->repaint(region); +} + +- (bool)restoreGeometry: (OFDataArray*)geometry +{ + return toQt(self)->restoreGeometry(toQt(geometry)); +} + +- (OFDataArray*)saveGeometry +{ + return toOF(toQt(self)->saveGeometry()); +} + +- (void)scrollRight: (int)dx + down: (int)dy +{ + toQt(self)->scroll(dx, dy); +} + +- (void)scrollRight: (int)dx + down: (int)dy + inRectangle: (of_rectangle_t)rect +{ + toQt(self)->scroll(dx, dy, toQt(rect)); +} + +- (void)setAttribute: (Qt::WidgetAttribute)attribute + to: (bool)on +{ + toQt(self)->setAttribute(attribute, on); +} + +#ifdef QT_KEYPAD_NAVIGATION +- (void)setEditFocus: (bool)enable +{ + toQt(self)->setEditFocus(enable); +} +#endif + +- (void)setFixedHeight: (int)height +{ + toQt(self)->setFixedHeight(height); +} + +- (void)setFixedSize: (of_dimension_t)size +{ + toQt(self)->setFixedSize(toQt(size)); +} + +- (void)setFixedWidth: (int)width +{ + toQt(self)->setFixedWidth(width); +} + +- (void)setFocus: (Qt::FocusReason)reason +{ + toQt(self)->setFocus(reason); +} + +- (void)setFocusProxy: (QtWidget*)widget +{ + toQt(self)->setFocusProxy(toQt(widget)); +} + +- (void)setForegroundRole: (QPalette::ColorRole)role +{ + toQt(self)->setForegroundRole(role); +} + +- (void)setGraphicsEffect: (QGraphicsEffect*)effect +{ + toQt(self)->setGraphicsEffect(effect); +} + +- (void)setLayout: (QLayout*)layout +{ + toQt(self)->setLayout(layout); +} + +- (void)setMaskFromBitmap: (const QBitmap&)bitmap +{ + toQt(self)->setMask(bitmap); +} + +- (void)setMask: (const QRegion&)region +{ + toQt(self)->setMask(region); +} + +- (void)setParent: (QtWidget*)parent +{ + toQt(self)->setParent(toQt(parent)); +} + +- (void)setParent: (QtWidget*)parent + flags: (Qt::WindowFlags)flags +{ + toQt(self)->setParent(toQt(parent), flags); +} + +- (void)setAutoRepeat: (bool)enable + forShortcut: (int)ID +{ + toQt(self)->setShortcutAutoRepeat(ID, enable); +} + +- (void)setEnabled: (bool)enable + forShortcut: (int)ID +{ + toQt(self)->setShortcutEnabled(ID, enable); +} + +- (void)setStyle: (QStyle*)style +{ + toQt(self)->setStyle(style); +} + +- (void)setWindowRole: (OFString*)role +{ + toQt(self)->setWindowRole(toQt(role)); +} + +- (void)setWindowState: (Qt::WindowStates)windowState +{ + toQt(self)->setWindowState(windowState); +} + +- (void)stackUnder: (QtWidget*)widget +{ + toQt(self)->stackUnder(toQt(widget)); +} + +- (QStyle*)style +{ + return toQt(self)->style(); +} + +- (bool)testAttribute: (Qt::WidgetAttribute)attribute +{ + return toQt(self)->testAttribute(attribute); +} + +- (bool)isUnderMouse +{ + return toQt(self)->underMouse(); +} + +- (void)ungrabGesture: (Qt::GestureType)gesture +{ + toQt(self)->ungrabGesture(gesture); +} + +- (void)updateInRectangle: (of_rectangle_t)rect +{ + toQt(self)->update(toQt(rect)); +} + +- (void)updateInRegion: (const QRegion&)region +{ + toQt(self)->update(region); +} + +- (void)updateGeometry +{ + toQt(self)->updateGeometry(); +} + +- (QRegion)visibleRegion +{ + return toQt(self)->visibleRegion(); +} + +- (WId)winID +{ + return toQt(self)->winId(); +} + +- (QtWidget*)window +{ + return toOF(toQt(self)->window()); +} + +- (QWindow*)windowHandle +{ + return toQt(self)->windowHandle(); +} + +- (OFString*)windowRole +{ + return toOF(toQt(self)->windowRole()); +} + +- (Qt::WindowStates)windowState +{ + return toQt(self)->windowState(); +} + +- (Qt::WindowType)windowType +{ + return toQt(self)->windowType(); +} +@end ADDED src/common/Makefile Index: src/common/Makefile ================================================================== --- src/common/Makefile +++ src/common/Makefile @@ -0,0 +1,11 @@ +include ../../extra.mk + +STATIC_PIC_LIB_NOINST = ${COMMON_LIB_A} +STATIC_LIB_NOINST = ${COMMON_A} + +SRCS = OFDataArray+QByteArray.mm \ + OFString+QString.mm + +include ../../buildsys.mk + +CPPFLAGS += -I. -I../QtCore ADDED src/common/OFDataArray+QByteArray.h Index: src/common/OFDataArray+QByteArray.h ================================================================== --- src/common/OFDataArray+QByteArray.h +++ src/common/OFDataArray+QByteArray.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +#include + +@interface OFDataArray (QByteArray) ++ (instancetype)dataArrayWithQByteArray: (const QByteArray&)qByteArray; +- (QByteArray)qByteArray; +@end + +namespace ObjQt { + +static OF_INLINE OFDataArray* +toOF(const QByteArray &qByteArray) +{ + return [OFDataArray dataArrayWithQByteArray: qByteArray]; +} + +static OF_INLINE QByteArray +toQt(OFDataArray *dataArray) +{ + return [dataArray qByteArray]; +} + +} ADDED src/common/OFDataArray+QByteArray.mm Index: src/common/OFDataArray+QByteArray.mm ================================================================== --- src/common/OFDataArray+QByteArray.mm +++ src/common/OFDataArray+QByteArray.mm @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "OFDataArray+QByteArray.h" + +@implementation OFDataArray (QByteArray) ++ (instancetype)dataArrayWithQByteArray: (const QByteArray&)qByteArray +{ + OFDataArray *ret = [OFDataArray dataArray]; + [ret addItems: qByteArray.data() + count: qByteArray.count()]; + + return ret; +} + +- (QByteArray)qByteArray +{ + return QByteArray((char*)[self items], [self count] * [self itemSize]); +} +@end ADDED src/common/OFString+QString.h Index: src/common/OFString+QString.h ================================================================== --- src/common/OFString+QString.h +++ src/common/OFString+QString.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +#include + +@interface OFString (QString) ++ (instancetype)stringWithQString: (const QString&)qString; +- initWithQString: (const QString&)qString; +- (QString)qString; +@end + +namespace ObjQt { + +static OF_INLINE OFString* +toOF(const QString &qString) +{ + return [OFString stringWithQString: qString]; +} + +static OF_INLINE QString +toQt(OFString *string) +{ + return [string qString]; +} + +} ADDED src/common/OFString+QString.mm Index: src/common/OFString+QString.mm ================================================================== --- src/common/OFString+QString.mm +++ src/common/OFString+QString.mm @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import "OFString+QString.h" + +@implementation OFString (QString) ++ stringWithQString: (const QString&)qString +{ + return [[[self alloc] initWithQString: qString] autorelease]; +} + +- initWithQString: (const QString&)qString +{ + static_assert(sizeof(QChar) == sizeof(of_char16_t), + "QChar and of_char16_t have a different size!"); + + return [self initWithUTF16String: (of_char16_t*)qString.data() + length: qString.length()]; +} + +- (QString)qString +{ + static_assert(sizeof(of_char16_t) == sizeof(QChar), + "of_char16_t and QChar have a different size!"); + + void *pool = objc_autoreleasePoolPush(); + QString ret = QString((QChar*)[self UTF16String]); + + objc_autoreleasePoolPop(pool); + + return ret; +} +@end ADDED src/common/QtOwnershipManaging.h Index: src/common/QtOwnershipManaging.h ================================================================== --- src/common/QtOwnershipManaging.h +++ src/common/QtOwnershipManaging.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +@protocol QtOwnershipManaging +- (void)takeOwnership; +- (void)giveUpOwnership; +@end ADDED src/common/helpers.h Index: src/common/helpers.h ================================================================== --- src/common/helpers.h +++ src/common/helpers.h @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2017, Jonathan Schleifer + * + * https://heap.zone/git/objqt.git + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#import + +#include +#include + +#import "QtObject.h" +#import "QtAction.h" +#import "QtEvent.h" +#import "QtChildEvent.h" +#import "QtThread.h" +#import "QtWidget.h" + +namespace ObjQt { + +static OF_INLINE of_point_t +toOF(const QPoint &qPoint) +{ + return of_point(qPoint.x(), qPoint.y()); +} + +static OF_INLINE QPoint +toQt(of_point_t point) +{ + return QPoint(point.x, point.y); +} + +static OF_INLINE of_dimension_t +toOF(const QSize &qSize) +{ + return of_dimension(qSize.width(), qSize.height()); +} + +static OF_INLINE QSize +toQt(of_dimension_t dimension) +{ + return QSize(dimension.width, dimension.height); +} + +static OF_INLINE of_rectangle_t +toOF(const QRect &qRect) +{ + return of_rectangle(qRect.x(), qRect.y(), + qRect.width(), qRect.height()); +} + +static OF_INLINE QRect +toQt(of_rectangle_t rectangle) +{ + return QRect(rectangle.origin.x, rectangle.origin.y, + rectangle.size.width, rectangle.size.height); +} + +}