AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove stale references to Qtopia

Browse Source 
Change-Id: Idd9b5fae8f6a0273636a878325e82e5664a40d43
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
This commit is contained in:
Donald Carr 2012-03-09 00:59:37 +00:00 committed by Qt by Nokia
parent 86dd454461
commit 431eb30e9e
4 changed files with 0 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/platforms/xcb/qxcbkeyboard.cpp
View File

@ -247,24 +247,6 @@
// end of XF86keysyms.h // end of XF86keysyms.h
// Special keys used by Qtopia, mapped into the X11 private keypad range.
#define QTOPIAXK_Select 0x11000601
#define QTOPIAXK_Yes 0x11000602
#define QTOPIAXK_No 0x11000603
#define QTOPIAXK_Cancel 0x11000604
#define QTOPIAXK_Printer 0x11000605
#define QTOPIAXK_Execute 0x11000606
#define QTOPIAXK_Sleep 0x11000607
#define QTOPIAXK_Play 0x11000608
#define QTOPIAXK_Zoom 0x11000609
#define QTOPIAXK_Context1 0x1100060A
#define QTOPIAXK_Context2 0x1100060B
#define QTOPIAXK_Context3 0x1100060C
#define QTOPIAXK_Context4 0x1100060D
#define QTOPIAXK_Call 0x1100060E
#define QTOPIAXK_Hangup 0x1100060F
#define QTOPIAXK_Flip 0x11000610
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
// keyboard mapping table // keyboard mapping table
@ -573,24 +555,6 @@ static const unsigned int KeyTbl[] = {
XF86XK_LaunchE, Qt::Key_LaunchG, XF86XK_LaunchE, Qt::Key_LaunchG,
XF86XK_LaunchF, Qt::Key_LaunchH, XF86XK_LaunchF, Qt::Key_LaunchH,
// Qtopia keys
QTOPIAXK_Select, Qt::Key_Select,
QTOPIAXK_Yes, Qt::Key_Yes,
QTOPIAXK_No, Qt::Key_No,
QTOPIAXK_Cancel, Qt::Key_Cancel,
QTOPIAXK_Printer, Qt::Key_Printer,
QTOPIAXK_Execute, Qt::Key_Execute,
QTOPIAXK_Sleep, Qt::Key_Sleep,
QTOPIAXK_Play, Qt::Key_Play,
QTOPIAXK_Zoom, Qt::Key_Zoom,
QTOPIAXK_Context1, Qt::Key_Context1,
QTOPIAXK_Context2, Qt::Key_Context2,
QTOPIAXK_Context3, Qt::Key_Context3,
QTOPIAXK_Context4, Qt::Key_Context4,
QTOPIAXK_Call, Qt::Key_Call,
QTOPIAXK_Hangup, Qt::Key_Hangup,
QTOPIAXK_Flip, Qt::Key_Flip,
0, 0 0, 0
}; };

36
src/plugins/platforms/xlib/qxlibkeyboard.cpp
View File

@ -243,24 +243,6 @@
// end of XF86keysyms.h // end of XF86keysyms.h
// Special keys used by Qtopia, mapped into the X11 private keypad range.
#define QTOPIAXK_Select 0x11000601
#define QTOPIAXK_Yes 0x11000602
#define QTOPIAXK_No 0x11000603
#define QTOPIAXK_Cancel 0x11000604
#define QTOPIAXK_Printer 0x11000605
#define QTOPIAXK_Execute 0x11000606
#define QTOPIAXK_Sleep 0x11000607
#define QTOPIAXK_Play 0x11000608
#define QTOPIAXK_Zoom 0x11000609
#define QTOPIAXK_Context1 0x1100060A
#define QTOPIAXK_Context2 0x1100060B
#define QTOPIAXK_Context3 0x1100060C
#define QTOPIAXK_Context4 0x1100060D
#define QTOPIAXK_Call 0x1100060E
#define QTOPIAXK_Hangup 0x1100060F
#define QTOPIAXK_Flip 0x11000610
// keyboard mapping table // keyboard mapping table
static const unsigned int KeyTbl[] = { static const unsigned int KeyTbl[] = {
@ -567,24 +549,6 @@ static const unsigned int KeyTbl[] = {
XF86XK_LaunchE, Qt::Key_LaunchG, XF86XK_LaunchE, Qt::Key_LaunchG,
XF86XK_LaunchF, Qt::Key_LaunchH, XF86XK_LaunchF, Qt::Key_LaunchH,
// Qtopia keys
QTOPIAXK_Select, Qt::Key_Select,
QTOPIAXK_Yes, Qt::Key_Yes,
QTOPIAXK_No, Qt::Key_No,
QTOPIAXK_Cancel, Qt::Key_Cancel,
QTOPIAXK_Printer, Qt::Key_Printer,
QTOPIAXK_Execute, Qt::Key_Execute,
QTOPIAXK_Sleep, Qt::Key_Sleep,
QTOPIAXK_Play, Qt::Key_Play,
QTOPIAXK_Zoom, Qt::Key_Zoom,
QTOPIAXK_Context1, Qt::Key_Context1,
QTOPIAXK_Context2, Qt::Key_Context2,
QTOPIAXK_Context3, Qt::Key_Context3,
QTOPIAXK_Context4, Qt::Key_Context4,
QTOPIAXK_Call, Qt::Key_Call,
QTOPIAXK_Hangup, Qt::Key_Hangup,
QTOPIAXK_Flip, Qt::Key_Flip,
0, 0 0, 0
}; };

19
src/printsupport/dialogs/qprintdialog.h
View File

@ -117,11 +117,6 @@ public:
QPrinter *printer(); QPrinter *printer();
#endif #endif
#ifdef QTOPIA_PRINTDIALOG
public:
bool eventFilter(QObject *, QEvent *);
#endif
#ifdef Q_NO_USING_KEYWORD #ifdef Q_NO_USING_KEYWORD
#ifndef Q_QDOC #ifndef Q_QDOC
void accepted() { QDialog::accepted(); } void accepted() { QDialog::accepted(); }
@ -134,7 +129,6 @@ Q_SIGNALS:
void accepted(QPrinter *printer); void accepted(QPrinter *printer);
private: private:
#ifndef QTOPIA_PRINTDIALOG
Q_PRIVATE_SLOT(d_func(), void _q_chbPrintLastFirstToggled(bool)) Q_PRIVATE_SLOT(d_func(), void _q_chbPrintLastFirstToggled(bool))
#if defined (Q_OS_UNIX) #if defined (Q_OS_UNIX)
Q_PRIVATE_SLOT(d_func(), void _q_collapseOrExpandDialog()) Q_PRIVATE_SLOT(d_func(), void _q_collapseOrExpandDialog())
@ -142,19 +136,6 @@ private:
# if defined(Q_OS_UNIX) && !defined(QT_NO_MESSAGEBOX) # if defined(Q_OS_UNIX) && !defined(QT_NO_MESSAGEBOX)
Q_PRIVATE_SLOT(d_func(), void _q_checkFields()) Q_PRIVATE_SLOT(d_func(), void _q_checkFields())
# endif # 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; friend class QUnixPrintWidget;
}; };

2
src/printsupport/kernel/qprinter.cpp
View File

@ -58,8 +58,6 @@
#if defined (Q_WS_WIN) #if defined (Q_WS_WIN)
#include <private/qprintengine_win_p.h> #include <private/qprintengine_win_p.h>
#elif defined (QTOPIA_PRINTENGINE)
#include <private/qprintengine_qws_p.h>
#endif #endif
#if defined(Q_WS_X11) #if defined(Q_WS_X11)