whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some more qapp dependencies

bb10
Lars Knoll 2011-05-05 14:07:23 +02:00
parent 288d388496
commit 2bcd79e213
9 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,8 +43,6 @@
#ifndef QT_NO_CLIPBOARD
#include "qapplication.h"
#include "private/qapplication_p.h"
#include "qpixmap.h"
#include "qclipboard_p.h"
#include "qvariant.h"

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

@ -44,7 +44,7 @@
#ifndef QT_NO_CLIPBOARD
#include "qmimedata.h"
#include "private/qapplication_p.h"
#include "private/qguiapplication_p.h"
#include "qplatformclipboard_qpa.h"
QT_BEGIN_NAMESPACE

3
src/gui/guikernel/qevent.cpp
View File

@ -41,7 +41,6 @@
#include "qevent.h"
#include "qcursor.h"
#include "qapplication.h"
#include "private/qguiapplication_p.h"
#include "private/qevent_p.h"
#include "private/qkeysequence_p.h"
@ -49,7 +48,7 @@
#include "qgraphicsview.h"
#include "qdebug.h"
#include "qmime.h"
#include "qdnd_p.h"
#include "private/qdnd_p.h"
#include "qevent_p.h"
#include "qgesture.h"
#include "private/qgesture_p.h"

5
src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
View File

@ -41,13 +41,12 @@
#include "qeventdispatcher_glib_qpa_p.h"
#include "qapplication.h"
#include "qguiapplication.h"
#include "qplatformdefs.h"
#include "qapplication.h"
#include <glib.h>
#include "private/qapplication_p.h"
#include "private/qguiapplication_p.h"
#include <qdebug.h>

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

@ -41,7 +41,7 @@
#include "qgenericpluginfactory_qpa.h"
#include "qapplication.h"
#include "qguiapplication.h"
#include "private/qfactoryloader_p.h"
#include "qgenericplugin_qpa.h"
#include "qdebug.h"

25
src/gui/guikernel/qkeysequence.cpp
View File

@ -45,7 +45,6 @@
#ifndef QT_NO_SHORTCUT
#include "qshortcut.h"
#include "qdebug.h"
#ifndef QT_NO_REGEXP
# include "qregexp.h"
@ -1234,10 +1233,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
QList<QModifKeyName> modifs;
if (nativeText) {
modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
<< QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
<< QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
<< QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
modifs << QModifKeyName(Qt::CTRL, QCoreApplication::translate("QShortcut", "Ctrl").toLower().append(QLatin1Char('+')))
<< QModifKeyName(Qt::SHIFT, QCoreApplication::translate("QShortcut", "Shift").toLower().append(QLatin1Char('+')))
<< QModifKeyName(Qt::ALT, QCoreApplication::translate("QShortcut", "Alt").toLower().append(QLatin1Char('+')))
<< QModifKeyName(Qt::META, QCoreApplication::translate("QShortcut", "Meta").toLower().append(QLatin1Char('+')));
}
modifs += *gmodifs; // Test non-translated ones last
@ -1299,7 +1298,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
++tran;
for (int i = 0; keyname[i].name; ++i) {
QString keyName(tran == 0
? QShortcut::tr(keyname[i].name)
? QCoreApplication::translate("QShortcut", keyname[i].name)
: QString::fromLatin1(keyname[i].name));
if (accel == keyName.toLower()) {
ret |= keyname[i].key;
@ -1327,7 +1326,7 @@ QString QKeySequence::encodeString(int key)
static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
{
if (!str.isEmpty())
str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
str += (format == QKeySequence::NativeText) ? QCoreApplication::translate("QShortcut", "+")
: QString::fromLatin1("+");
str += theKey;
}
@ -1367,13 +1366,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
{
// On other systems the order is Meta, Control, Alt, Shift
if ((key & Qt::META) == Qt::META)
s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
s = nativeText ? QCoreApplication::translate("QShortcut", "Meta") : QString::fromLatin1("Meta");
if ((key & Qt::CTRL) == Qt::CTRL)
addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Ctrl") : QString::fromLatin1("Ctrl"), format);
if ((key & Qt::ALT) == Qt::ALT)
addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Alt") : QString::fromLatin1("Alt"), format);
if ((key & Qt::SHIFT) == Qt::SHIFT)
addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
addKey(s, nativeText ? QCoreApplication::translate("QShortcut", "Shift") : QString::fromLatin1("Shift"), format);
}
@ -1388,7 +1387,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
p += QChar((key-0x10000)%400+0xdc00);
}
} else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
p = nativeText ? QCoreApplication::translate("QShortcut", "F%1").arg(key - Qt::Key_F1 + 1)
: QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
} else if (key) {
int i=0;
@ -1407,7 +1406,7 @@ NonSymbol:
#endif
while (keyname[i].name) {
if (key == keyname[i].key) {
p = nativeText ? QShortcut::tr(keyname[i].name)
p = nativeText ? QCoreApplication::translate("QShortcut", keyname[i].name)
: QString::fromLatin1(keyname[i].name);
break;
}

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

@ -44,7 +44,7 @@
#include "private/qfactoryloader_p.h"
#include "qmutex.h"
#include "qapplication.h"
#include "qguiapplication.h"
#include "qdebug.h"
QT_BEGIN_NAMESPACE

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

@ -40,10 +40,8 @@
****************************************************************************/
#include <qsessionmanager.h>
#include <qapplication.h>
#include <private/qobject_p.h>
#include <qapplication.h>
#ifndef QT_NO_SESSIONMANAGER

9
src/gui/text/text.pri
View File

@ -9,10 +9,7 @@ HEADERS += \
text/qfontmetrics.h \
text/qfont_p.h \
text/qfontsubset_p.h \
text/qlinecontrol_p.h \
text/qtextcontrol_p.h \
text/qtextcontrol_p_p.h \
text/qtextengine_p.h \
text/qtextengine_p.h \
text/qtextlayout.h \
text/qtextformat.h \
text/qtextformat_p.h \
@ -52,9 +49,7 @@ SOURCES += \
text/qfontsubset.cpp \
text/qfontmetrics.cpp \
text/qfontdatabase.cpp \
text/qlinecontrol.cpp \
text/qtextcontrol.cpp \
text/qtextengine.cpp \
text/qtextengine.cpp \
text/qtextlayout.cpp \
text/qtextformat.cpp \
text/qtextobject.cpp \