diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
| commit | d5098f2802255da10b749b93705084ad1fdfc6a5 (patch) | |
| tree | 6462008a4ab7d13435d93490fed96c62c516cbdf /src/printsupport/dialogs/qprintdialog.h | |
| parent | d5a85940f785459d7b982d5fdf59a9fd18825092 (diff) | |
| parent | b5b41c18345719612e5411cc482466d2dbafdaf7 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
Diffstat (limited to 'src/printsupport/dialogs/qprintdialog.h')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 975640e6ee..8b8402f4fb 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -117,11 +117,6 @@ public: QPrinter *printer(); #endif -#ifdef QTOPIA_PRINTDIALOG -public: - bool eventFilter(QObject *, QEvent *); -#endif - #ifdef Q_NO_USING_KEYWORD #ifndef Q_QDOC void accepted() { QDialog::accepted(); } @@ -134,7 +129,6 @@ Q_SIGNALS: void accepted(QPrinter *printer); private: -#ifndef QTOPIA_PRINTDIALOG Q_PRIVATE_SLOT(d_func(), void _q_chbPrintLastFirstToggled(bool)) #if defined (Q_OS_UNIX) Q_PRIVATE_SLOT(d_func(), void _q_collapseOrExpandDialog()) @@ -142,19 +136,6 @@ private: # if defined(Q_OS_UNIX) && !defined(QT_NO_MESSAGEBOX) Q_PRIVATE_SLOT(d_func(), void _q_checkFields()) # endif -#else // QTOPIA_PRINTDIALOG - Q_PRIVATE_SLOT(d_func(), void _q_okClicked()) - Q_PRIVATE_SLOT(d_func(),void _q_printerOrFileSelected(QAbstractButton *b)) - Q_PRIVATE_SLOT(d_func(),void _q_paperSizeSelected(int)) - Q_PRIVATE_SLOT(d_func(), void _q_orientSelected(int)) - Q_PRIVATE_SLOT(d_func(), void _q_pageOrderSelected(int)) - Q_PRIVATE_SLOT(d_func(), void _q_colorModeSelected(QAbstractButton *)) - Q_PRIVATE_SLOT(d_func(), void _q_setNumCopies(int)) - Q_PRIVATE_SLOT(d_func(), void _q_printRangeSelected(int)) - Q_PRIVATE_SLOT(d_func(), void _q_setFirstPage(int)) - Q_PRIVATE_SLOT(d_func(), void _q_setLastPage(int)) - Q_PRIVATE_SLOT(d_func(), void _q_fileNameEditChanged(const QString &text)) -#endif // QTOPIA_PRINTDIALOG friend class QUnixPrintWidget; }; |