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

More QApplication prefixes changed.

Browse Source
This commit is contained in:
Samuel Rødal 2011-05-04 15:13:18 +02:00
parent 08ba97f653
commit 7196329d32
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/guikernel/qcursor.cpp
View File

@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
To associate a cursor with a widget, use QWidget::setCursor(). To
associate a cursor with all widgets (normally for a short period
of time), use QApplication::setOverrideCursor().
of time), use QGuiApplication::setOverrideCursor().
To set a cursor shape use QCursor::setShape() or use the QCursor
constructor which takes the shape as argument, or you can use one
@ -85,9 +85,9 @@ QT_BEGIN_NAMESPACE
methods QCursor::pos() and QCursor::setPos().
\bold{Note:} It is possible to create a QCursor before
QApplication, but it is not useful except as a place-holder for a
real QCursor created after QApplication. Attempting to use a
QCursor that was created before QApplication will result in a
QGuiApplication, but it is not useful except as a place-holder for a
real QCursor created after QGuiApplication. Attempting to use a
QCursor that was created before QGuiApplication will result in a
crash.
\section1 A Note for X11 Users

4
src/gui/guikernel/qguiapplication.cpp
View File

@ -111,7 +111,7 @@ QFont *QGuiApplicationPrivate::app_font = 0;
static bool qt_detectRTLLanguage()
{
return force_reverse ^
(QApplication::tr("QT_LAYOUT_DIRECTION",
(QCoreApplication::tr("QT_LAYOUT_DIRECTION",
"Translate this string to the string 'LTR' in left-to-right"
" languages or to 'RTL' in right-to-left languages (such as Hebrew"
" and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
@ -811,7 +811,7 @@ QClipboard * QGuiApplication::clipboard()
{
if (QGuiApplicationPrivate::qt_clipboard == 0) {
if (!qApp) {
qWarning("QApplication: Must construct a QApplication before accessing a QClipboard");
qWarning("QGuiApplication: Must construct a QGuiApplication before accessing a QClipboard");
return 0;
}
QGuiApplicationPrivate::qt_clipboard = new QClipboard(0);

2
src/gui/guikernel/qsessionmanager.h
View File

@ -61,7 +61,7 @@ class Q_GUI_EXPORT QSessionManager : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QSessionManager)
QSessionManager(QApplication *app, QString &id, QString &key);
QSessionManager(QGuiApplication *app, QString &id, QString &key);
~QSessionManager();
public:
QString sessionId() const;

2
src/gui/guikernel/qsessionmanager_qpa.cpp
View File

@ -69,7 +69,7 @@ QSessionManagerPrivate::QSessionManagerPrivate(QSessionManager*,
{
}
QSessionManager::QSessionManager(QApplication *app, QString &id, QString &key)
QSessionManager::QSessionManager(QGuiApplication *app, QString &id, QString &key)
: QObject(*(new QSessionManagerPrivate(this, id, key)), app)
{
Q_D(QSessionManager);

2
src/gui/guikernel/qshortcutmap.cpp
View File

@ -876,7 +876,7 @@ void QShortcutMap::dispatchEvent(QKeyEvent *e)
<< (bool)(enabledShortcuts>1) << ") to object(" << next->owner << ')';
#endif
QShortcutEvent se(next->keyseq, next->id, enabledShortcuts>1);
QApplication::sendEvent(const_cast<QObject *>(next->owner), &se);
QCoreApplication::sendEvent(const_cast<QObject *>(next->owner), &se);
}
/* \internal

2
src/gui/guikernel/qwindowsysteminterface_qpa.cpp
View File

@ -187,7 +187,7 @@ void QWindowSystemInterfacePrivate::queueWindowSystemEvent(QWindowSystemInterfac
windowSystemEventQueue.append(ev);
queueMutex.unlock();
QAbstractEventDispatcher *dispatcher = QApplicationPrivate::qt_qpa_core_dispatcher();
QAbstractEventDispatcher *dispatcher = QGuiApplicationPrivate::qt_qpa_core_dispatcher();
if (dispatcher)
dispatcher->wakeUp();
}