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

Fix warnings about unused variables.

Browse Source 
Fix MSVC warnings about unused q, d where only static functions
are used.

Change-Id: I239d6fc3c851b0a62434cb09fc0e1967f2e6d031
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Friedemann Kleint 2012-04-03 09:37:13 +02:00 committed by Qt by Nokia
parent 7108acde8a
commit fd4f165eb7
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,12 +604,10 @@ static void init_plugins(const QList<QByteArray> &pluginList)
void QGuiApplicationPrivate::createPlatformIntegration()
{
Q_Q(QGuiApplication);
// Use the Qt menus by default. Platform plugins that
// want to enable a native menu implementation can clear
// this flag.
q->setAttribute(Qt::AA_DontUseNativeMenuBar, true);
QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
// Load the platform integration
QString platformPluginPath = QLatin1String(qgetenv("QT_QPA_PLATFORM_PLUGIN_PATH"));

5
src/gui/kernel/qplatforminputcontext_qpa.cpp
View File

@ -244,15 +244,14 @@ void QPlatformInputContext::setFocusObject(QObject *object)
*/
bool QPlatformInputContext::inputMethodAccepted() const
{
Q_D(const QPlatformInputContext);
return d->s_inputMethodAccepted;
return QPlatformInputContextPrivate::s_inputMethodAccepted;
}
bool QPlatformInputContextPrivate::s_inputMethodAccepted = false;
void QPlatformInputContextPrivate::setInputMethodAccepted(bool accepted)
{
s_inputMethodAccepted = accepted;
QPlatformInputContextPrivate::s_inputMethodAccepted = accepted;
}

5
src/widgets/kernel/qapplication.cpp
View File

@ -1977,12 +1977,11 @@ void QApplication::syncX()
void QApplicationPrivate::notifyLayoutDirectionChange()
{
Q_Q(QApplication);
QWidgetList list = q->topLevelWidgets();
QWidgetList list = QApplication::topLevelWidgets();
for (int i = 0; i < list.size(); ++i) {
QWidget *w = list.at(i);
QEvent ev(QEvent::ApplicationLayoutDirectionChange);
q->sendEvent(w, &ev);
QCoreApplication::sendEvent(w, &ev);
}
}

6
src/widgets/kernel/qapplication_qpa.cpp
View File

@ -162,12 +162,11 @@ QWidget *qt_tlw_for_window(QWindow *wnd)
void QApplicationPrivate::notifyActiveWindowChange(QWindow *previous)
{
Q_UNUSED(previous);
Q_Q(QApplication);
QWindow *wnd = QGuiApplicationPrivate::focus_window;
if (inPopupMode()) // some delayed focus event to ignore
return;
QWidget *tlw = qt_tlw_for_window(wnd);
q->setActiveWindow(tlw);
QApplication::setActiveWindow(tlw);
}
static void ungrabKeyboardForPopup(QWidget *popup)
@ -201,7 +200,6 @@ static void grabForPopup(QWidget *popup)
void QApplicationPrivate::closePopup(QWidget *popup)
{
Q_Q(QApplication);
if (!popupWidgets)
return;
popupWidgets->removeAll(popup);
@ -241,7 +239,7 @@ void QApplicationPrivate::closePopup(QWidget *popup)
fw->setFocus(Qt::PopupFocusReason);
} else {
QFocusEvent e(QEvent::FocusIn, Qt::PopupFocusReason);
q->sendEvent(fw, &e);
QCoreApplication::sendEvent(fw, &e);
}
}
}