diff -u gmod-3.1/Makefile.gmod gmod-3.1/Makefile.gmod --- gmod-3.1/Makefile.gmod +++ gmod-3.1/Makefile.gmod @@ -14,8 +14,8 @@ CC = g++ # Where to put the binary and man page -BINDIR = debian/xgmod/tmp/usr/bin -MANDIR = debian/xgmod/tmp/usr/man/man1 +BINDIR = debian/gmod/tmp/usr/bin +MANDIR = debian/gmod/tmp/usr/man/man1 CFILES = compress.C cvt_period.C Sequencer.C gmod.C init.C \ load_669.C load_mod.C load_mtm.C load_s3m.C load_ult.C load_xm.C \ diff -u gmod-3.1/debian/control gmod-3.1/debian/control --- gmod-3.1/debian/control +++ gmod-3.1/debian/control @@ -1,5 +1,5 @@ Source: gmod -Build-Depends: debhelper (>=5.0), libqt3-mt-dev, libncurses5-dev | libncurses-dev, libx11-dev, zlib1g-dev | libz-dev +Build-Depends: debhelper (>=5.0), libncurses5-dev | libncurses-dev, zlib1g-dev | libz-dev Section: sound Priority: optional Maintainer: Riku Voipio @@ -17,10 +16,0 @@ -Package: xgmod -Architecture: i386 -Section: sound -Priority: extra -Depends: ${shlibs:Depends} -Description: GUI based module player for Ultrasound and SB AWE soundcards - XGmod plays MOD/669/MTM/S3M/ULT/XM modules on machines that have an - Gravis Ultrasound family sound card or a Sound Blaster AWE. - . - This version has an X interface that depends on Qt. diff -u gmod-3.1/debian/changelog gmod-3.1/debian/changelog --- gmod-3.1/debian/changelog +++ gmod-3.1/debian/changelog @@ -1,3 +1,10 @@ +gmod (3.1-14) unstable; urgency=low + + * The "maybe this package still works" Release + * Remove QT3 based xgmod package, closes: #604482 + + -- Riku Voipio Mon, 28 May 2012 17:08:44 +0300 + gmod (3.1-13) unstable; urgency=low * The "I still maintain museumware" Release reverted: --- gmod-3.1/debian/xgmod.dirs +++ gmod-3.1.orig/debian/xgmod.dirs @@ -1,2 +0,0 @@ -usr/bin -usr/share/man/man1 reverted: --- gmod-3.1/debian/xgmod.menu +++ gmod-3.1.orig/debian/xgmod.menu @@ -1,2 +0,0 @@ -?package(xgmod):needs="x11" section="Apps/Sound" title="Xgmod" \ - command="/usr/bin/xgmod" diff -u gmod-3.1/debian/rules gmod-3.1/debian/rules --- gmod-3.1/debian/rules +++ gmod-3.1/debian/rules @@ -7,7 +7,6 @@ build: dh_testdir - make make -f Makefile.gmod clean make -f Makefile.gmod @@ -17,7 +16,6 @@ dh_testdir dh_testroot -rm -f build install-stamp debian/substvars - -make clean -make -f Makefile.gmod clean dh_clean @@ -35,8 +33,6 @@ dh_installdirs -a install -s gmod debian/gmod/usr/bin/gmod cp gmod.1 debian/gmod/usr/share/man/man1/gmod.1 - install -s xgmod debian/xgmod/usr/bin/xgmod - cp xgmod.1 debian/xgmod/usr/share/man/man1/xgmod.1 dh_installmenu -a dh_strip -a dh_installchangelogs -a ChangeLog reverted: --- gmod-3.1/debian/xgmod.README.debian +++ gmod-3.1.orig/debian/xgmod.README.debian @@ -1,25 +0,0 @@ -[x]gmod for DEBIAN ----------------------- - -* gmod needs access to /dev/sequencer and /dev/midi00, that can be - accomplished by either: - - 1. Adding yourself in the audio group (in /etc/group file, with "vigr") - - Recommended, has least security problems - - 2. by making [x]gmod audio sgid executable. - - I haven't tried this, but the author suggests that it's safe. - Lets anyone play music on your desktop, but nobody should be able - to do anything else with the soundcard. - - 2. Giving /dev/sequencer world read and write permissions - - It can be annoying when someone logs from the net and begins - playing music through your loudspeakers. Besides someone - may listen your conversions if you have a mic plugged in. - do this only of your absolutely sure what you're doing. - - -Riku Voipio , Mon, 30 Dec 1996 22:44:55 +0200 only in patch2: unchanged: --- gmod-3.1.orig/SampleShell.moc +++ gmod-3.1/SampleShell.moc @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'SampleShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "SampleShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'SampleShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_SampleShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 13, 12, 12, 12, 0x0a, + 31, 12, 12, 12, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_SampleShell[] = { + "SampleShell\0\0showSampleShell()\0" + "closeSampleShell()\0" +}; + +void SampleShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + SampleShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showSampleShell(); break; + case 1: _t->closeSampleShell(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData SampleShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject SampleShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_SampleShell, + qt_meta_data_SampleShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &SampleShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *SampleShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *SampleShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_SampleShell)) + return static_cast(const_cast< SampleShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int SampleShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE only in patch2: unchanged: --- gmod-3.1.orig/CommentShell.moc +++ gmod-3.1/CommentShell.moc @@ -0,0 +1,97 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'CommentShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "CommentShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'CommentShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_CommentShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 2, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x0a, + 33, 13, 13, 13, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_CommentShell[] = { + "CommentShell\0\0showCommentShell()\0" + "closeCommentShell()\0" +}; + +void CommentShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + CommentShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showCommentShell(); break; + case 1: _t->closeCommentShell(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData CommentShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject CommentShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_CommentShell, + qt_meta_data_CommentShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &CommentShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *CommentShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *CommentShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_CommentShell)) + return static_cast(const_cast< CommentShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int CommentShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 2) + qt_static_metacall(this, _c, _id, _a); + _id -= 2; + } + return _id; +} +QT_END_MOC_NAMESPACE only in patch2: unchanged: --- gmod-3.1.orig/QueueShell.moc +++ gmod-3.1/QueueShell.moc @@ -0,0 +1,202 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'QueueShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "QueueShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'QueueShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_XQFileDialog[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 1, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 14, 13, 13, 13, 0x09, + + 0 // eod +}; + +static const char qt_meta_stringdata_XQFileDialog[] = { + "XQFileDialog\0\0done(int)\0" +}; + +void XQFileDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + XQFileDialog *_t = static_cast(_o); + switch (_id) { + case 0: _t->done((*reinterpret_cast< int(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData XQFileDialog::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject XQFileDialog::staticMetaObject = { + { &QFileDialog::staticMetaObject, qt_meta_stringdata_XQFileDialog, + qt_meta_data_XQFileDialog, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &XQFileDialog::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *XQFileDialog::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *XQFileDialog::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_XQFileDialog)) + return static_cast(const_cast< XQFileDialog*>(this)); + return QFileDialog::qt_metacast(_clname); +} + +int XQFileDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QFileDialog::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 1) + qt_static_metacall(this, _c, _id, _a); + _id -= 1; + } + return _id; +} +static const uint qt_meta_data_QueueShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 12, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x05, + + // slots: signature, parameters, type, tag, flags + 29, 11, 11, 11, 0x0a, + 46, 11, 11, 11, 0x08, + 63, 11, 11, 11, 0x08, + 78, 11, 11, 11, 0x08, + 91, 11, 11, 11, 0x08, + 105, 11, 11, 11, 0x08, + 119, 11, 11, 11, 0x08, + 135, 11, 11, 11, 0x08, + 150, 11, 11, 11, 0x08, + 167, 11, 11, 11, 0x08, + 193, 11, 11, 11, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_QueueShell[] = { + "QueueShell\0\0currentDeleted()\0" + "currentClicked()\0showQueueShell()\0" + "closeClicked()\0addClicked()\0saveClicked()\0" + "playClicked()\0removeClicked()\0" + "clearClicked()\0shuffleClicked()\0" + "loadFileSelected(QString)\0" + "saveFileSelected(QString)\0" +}; + +void QueueShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + QueueShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->currentDeleted(); break; + case 1: _t->currentClicked(); break; + case 2: _t->showQueueShell(); break; + case 3: _t->closeClicked(); break; + case 4: _t->addClicked(); break; + case 5: _t->saveClicked(); break; + case 6: _t->playClicked(); break; + case 7: _t->removeClicked(); break; + case 8: _t->clearClicked(); break; + case 9: _t->shuffleClicked(); break; + case 10: _t->loadFileSelected((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 11: _t->saveFileSelected((*reinterpret_cast< const QString(*)>(_a[1]))); break; + default: ; + } + } +} + +const QMetaObjectExtraData QueueShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject QueueShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_QueueShell, + qt_meta_data_QueueShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &QueueShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *QueueShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *QueueShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_QueueShell)) + return static_cast(const_cast< QueueShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int QueueShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 12) + qt_static_metacall(this, _c, _id, _a); + _id -= 12; + } + return _id; +} + +// SIGNAL 0 +void QueueShell::currentDeleted() +{ + QMetaObject::activate(this, &staticMetaObject, 0, 0); +} +QT_END_MOC_NAMESPACE only in patch2: unchanged: --- gmod-3.1.orig/TrackShell.moc +++ gmod-3.1/TrackShell.moc @@ -0,0 +1,98 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TrackShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "TrackShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TrackShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TrackShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 12, 11, 11, 11, 0x0a, + 29, 11, 11, 11, 0x0a, + 46, 11, 11, 11, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_TrackShell[] = { + "TrackShell\0\0showTrackShell()\0" + "setChannels(int)\0closeTrackShell()\0" +}; + +void TrackShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TrackShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showTrackShell(); break; + case 1: _t->setChannels((*reinterpret_cast< int(*)>(_a[1]))); break; + case 2: _t->closeTrackShell(); break; + default: ; + } + } +} + +const QMetaObjectExtraData TrackShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TrackShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_TrackShell, + qt_meta_data_TrackShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TrackShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TrackShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TrackShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TrackShell)) + return static_cast(const_cast< TrackShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int TrackShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE only in patch2: unchanged: --- gmod-3.1.orig/TopShell.moc +++ gmod-3.1/TopShell.moc @@ -0,0 +1,119 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'TopShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "TopShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'TopShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_TopShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 8, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 1, // signalCount + + // signals: signature, parameters, type, tag, flags + 10, 9, 9, 9, 0x05, + + // slots: signature, parameters, type, tag, flags + 29, 9, 9, 9, 0x08, + 43, 9, 9, 9, 0x08, + 60, 9, 9, 9, 0x08, + 74, 9, 9, 9, 0x08, + 88, 9, 9, 9, 0x08, + 106, 9, 9, 9, 0x08, + 120, 9, 9, 9, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_TopShell[] = { + "TopShell\0\0channelSignal(int)\0backClicked()\0" + "forwardClicked()\0playClicked()\0" + "nextClicked()\0previousClicked()\0" + "stopClicked()\0setRandom()\0" +}; + +void TopShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + TopShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->channelSignal((*reinterpret_cast< int(*)>(_a[1]))); break; + case 1: _t->backClicked(); break; + case 2: _t->forwardClicked(); break; + case 3: _t->playClicked(); break; + case 4: _t->nextClicked(); break; + case 5: _t->previousClicked(); break; + case 6: _t->stopClicked(); break; + case 7: _t->setRandom(); break; + default: ; + } + } +} + +const QMetaObjectExtraData TopShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject TopShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_TopShell, + qt_meta_data_TopShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &TopShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *TopShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *TopShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_TopShell)) + return static_cast(const_cast< TopShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int TopShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 8) + qt_static_metacall(this, _c, _id, _a); + _id -= 8; + } + return _id; +} + +// SIGNAL 0 +void TopShell::channelSignal(int _t1) +{ + void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; + QMetaObject::activate(this, &staticMetaObject, 0, _a); +} +QT_END_MOC_NAMESPACE only in patch2: unchanged: --- gmod-3.1.orig/OptShell.moc +++ gmod-3.1/OptShell.moc @@ -0,0 +1,99 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'OptShell.h' +** +** Created: Mon May 28 17:10:00 2012 +** by: The Qt Meta Object Compiler version 63 (Qt 4.8.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "OptShell.h" +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'OptShell.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 63 +#error "This file was generated using the moc from 4.8.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +static const uint qt_meta_data_OptShell[] = { + + // content: + 6, // revision + 0, // classname + 0, 0, // classinfo + 3, 14, // methods + 0, 0, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // slots: signature, parameters, type, tag, flags + 10, 9, 9, 9, 0x0a, + 25, 9, 9, 9, 0x08, + 34, 9, 9, 9, 0x08, + + 0 // eod +}; + +static const char qt_meta_stringdata_OptShell[] = { + "OptShell\0\0showOptShell()\0closex()\0" + "saveClicked()\0" +}; + +void OptShell::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + if (_c == QMetaObject::InvokeMetaMethod) { + Q_ASSERT(staticMetaObject.cast(_o)); + OptShell *_t = static_cast(_o); + switch (_id) { + case 0: _t->showOptShell(); break; + case 1: _t->closex(); break; + case 2: _t->saveClicked(); break; + default: ; + } + } + Q_UNUSED(_a); +} + +const QMetaObjectExtraData OptShell::staticMetaObjectExtraData = { + 0, qt_static_metacall +}; + +const QMetaObject OptShell::staticMetaObject = { + { &QWidget::staticMetaObject, qt_meta_stringdata_OptShell, + qt_meta_data_OptShell, &staticMetaObjectExtraData } +}; + +#ifdef Q_NO_DATA_RELOCATION +const QMetaObject &OptShell::getStaticMetaObject() { return staticMetaObject; } +#endif //Q_NO_DATA_RELOCATION + +const QMetaObject *OptShell::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; +} + +void *OptShell::qt_metacast(const char *_clname) +{ + if (!_clname) return 0; + if (!strcmp(_clname, qt_meta_stringdata_OptShell)) + return static_cast(const_cast< OptShell*>(this)); + return QWidget::qt_metacast(_clname); +} + +int OptShell::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QWidget::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + if (_c == QMetaObject::InvokeMetaMethod) { + if (_id < 3) + qt_static_metacall(this, _c, _id, _a); + _id -= 3; + } + return _id; +} +QT_END_MOC_NAMESPACE