Skip to content

COMP: Fix build against Qt 4.8 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

COMP: Fix build against Qt 4.8 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/PythonQtStdDecorators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,6 @@ bool PythonQtStdDecorators::disconnect(QObject* sender, const QByteArray& signal
return r;
}

#undef emit
void PythonQtStdDecorators::emit(QObject* sender, const QByteArray& signal, PyObject* arg1 ,PyObject* arg2 ,
PyObject* arg3 ,PyObject* arg4 ,PyObject* arg5 ,PyObject* arg6 ,PyObject* arg7 )
{
// TODO xxx
// use normal PythonQtSlot calling code, add "allowSignal" to member lookup?!
}
#define emit

QObject* PythonQtStdDecorators::parent(QObject* o) {
return o->parent();
}
Expand Down
5 changes: 0 additions & 5 deletions src/PythonQtStdDecorators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ public slots:
bool connect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot);
bool disconnect(QObject* sender, const QByteArray& signal, PyObject* callable);
bool disconnect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot);

#undef emit
void emit(QObject* sender, const QByteArray& signal, PyObject* arg1 = NULL,PyObject* arg2 = NULL,
PyObject* arg3 = NULL,PyObject* arg4 = NULL,PyObject* arg5 = NULL,PyObject* arg6 = NULL,PyObject* arg7 = NULL);
#define emit

QObject* parent(QObject* o);
void setParent(QObject* o, QObject* parent);
Expand Down