From f128c1f6d3cbdc1aa13f9ec65fd2354ef91c1c48 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Mon, 25 Jun 2012 18:27:22 -0700 Subject: [PATCH] Remove _qpa from cpp filenames 36547f4eff44361f7a6acd0cff107c0e47561f93 removed the _qpa from .h files and promised to remove it from .cpp files at a later date. Change-Id: I24a5c3796f6b07dd9a1931b699f3212d315edb12 Reviewed-by: Andrew Stanley-Jones --- src/gui/accessible/accessible.pri | 2 +- ...ity_qpa.cpp => qplatformaccessibility.cpp} | 0 src/gui/kernel/kernel.pri | 50 +++++++++---------- ...nericplugin_qpa.cpp => qgenericplugin.cpp} | 0 ...tory_qpa.cpp => qgenericpluginfactory.cpp} | 0 ...ipboard_qpa.cpp => qplatformclipboard.cpp} | 0 ...formcursor_qpa.cpp => qplatformcursor.cpp} | 0 ...lper_qpa.cpp => qplatformdialoghelper.cpp} | 0 ...platformdrag_qpa.cpp => qplatformdrag.cpp} | 0 ...text_qpa.cpp => qplatforminputcontext.cpp} | 0 ...a.cpp => qplatforminputcontextfactory.cpp} | 0 ...pa.cpp => qplatforminputcontextplugin.cpp} | 0 ...ation_qpa.cpp => qplatformintegration.cpp} | 0 ...pa.cpp => qplatformintegrationfactory.cpp} | 0 ...qpa.cpp => qplatformintegrationplugin.cpp} | 0 ...e_qpa.cpp => qplatformnativeinterface.cpp} | 0 ...ext_qpa.cpp => qplatformopenglcontext.cpp} | 0 ...formscreen_qpa.cpp => qplatformscreen.cpp} | 0 ...qpa.cpp => qplatformscreenpageflipper.cpp} | 0 ...services_qpa.cpp => qplatformservices.cpp} | 0 ...a.cpp => qplatformsharedgraphicscache.cpp} | 0 ...rmsurface_qpa.cpp => qplatformsurface.cpp} | 0 ...atformtheme_qpa.cpp => qplatformtheme.cpp} | 0 ...tory_qpa.cpp => qplatformthemefactory.cpp} | 0 ...lugin_qpa.cpp => qplatformthemeplugin.cpp} | 0 ...formwindow_qpa.cpp => qplatformwindow.cpp} | 0 ...ionmanager_qpa.cpp => qsessionmanager.cpp} | 0 ...ace_qpa.cpp => qwindowsysteminterface.cpp} | 0 src/gui/painting/painting.pri | 2 +- ...tore_qpa.cpp => qplatformbackingstore.cpp} | 0 ...base_qpa.cpp => qplatformfontdatabase.cpp} | 0 src/gui/text/text.pri | 2 +- .../eventdispatchers/eventdispatchers.pri | 2 +- ...tcher_qpa.cpp => qunixeventdispatcher.cpp} | 0 src/printsupport/kernel/kernel.pri | 2 +- ...rt_qpa.cpp => qplatformprintersupport.cpp} | 0 src/widgets/kernel/kernel.pri | 2 +- ...widgetwindow_qpa.cpp => qwidgetwindow.cpp} | 0 .../util/{qcolormap_qpa.cpp => qcolormap.cpp} | 0 src/widgets/util/util.pri | 2 +- 40 files changed, 32 insertions(+), 32 deletions(-) rename src/gui/accessible/{qplatformaccessibility_qpa.cpp => qplatformaccessibility.cpp} (100%) rename src/gui/kernel/{qgenericplugin_qpa.cpp => qgenericplugin.cpp} (100%) rename src/gui/kernel/{qgenericpluginfactory_qpa.cpp => qgenericpluginfactory.cpp} (100%) rename src/gui/kernel/{qplatformclipboard_qpa.cpp => qplatformclipboard.cpp} (100%) rename src/gui/kernel/{qplatformcursor_qpa.cpp => qplatformcursor.cpp} (100%) rename src/gui/kernel/{qplatformdialoghelper_qpa.cpp => qplatformdialoghelper.cpp} (100%) rename src/gui/kernel/{qplatformdrag_qpa.cpp => qplatformdrag.cpp} (100%) rename src/gui/kernel/{qplatforminputcontext_qpa.cpp => qplatforminputcontext.cpp} (100%) rename src/gui/kernel/{qplatforminputcontextfactory_qpa.cpp => qplatforminputcontextfactory.cpp} (100%) rename src/gui/kernel/{qplatforminputcontextplugin_qpa.cpp => qplatforminputcontextplugin.cpp} (100%) rename src/gui/kernel/{qplatformintegration_qpa.cpp => qplatformintegration.cpp} (100%) rename src/gui/kernel/{qplatformintegrationfactory_qpa.cpp => qplatformintegrationfactory.cpp} (100%) rename src/gui/kernel/{qplatformintegrationplugin_qpa.cpp => qplatformintegrationplugin.cpp} (100%) rename src/gui/kernel/{qplatformnativeinterface_qpa.cpp => qplatformnativeinterface.cpp} (100%) rename src/gui/kernel/{qplatformopenglcontext_qpa.cpp => qplatformopenglcontext.cpp} (100%) rename src/gui/kernel/{qplatformscreen_qpa.cpp => qplatformscreen.cpp} (100%) rename src/gui/kernel/{qplatformscreenpageflipper_qpa.cpp => qplatformscreenpageflipper.cpp} (100%) rename src/gui/kernel/{qplatformservices_qpa.cpp => qplatformservices.cpp} (100%) rename src/gui/kernel/{qplatformsharedgraphicscache_qpa.cpp => qplatformsharedgraphicscache.cpp} (100%) rename src/gui/kernel/{qplatformsurface_qpa.cpp => qplatformsurface.cpp} (100%) rename src/gui/kernel/{qplatformtheme_qpa.cpp => qplatformtheme.cpp} (100%) rename src/gui/kernel/{qplatformthemefactory_qpa.cpp => qplatformthemefactory.cpp} (100%) rename src/gui/kernel/{qplatformthemeplugin_qpa.cpp => qplatformthemeplugin.cpp} (100%) rename src/gui/kernel/{qplatformwindow_qpa.cpp => qplatformwindow.cpp} (100%) rename src/gui/kernel/{qsessionmanager_qpa.cpp => qsessionmanager.cpp} (100%) rename src/gui/kernel/{qwindowsysteminterface_qpa.cpp => qwindowsysteminterface.cpp} (100%) rename src/gui/painting/{qplatformbackingstore_qpa.cpp => qplatformbackingstore.cpp} (100%) rename src/gui/text/{qplatformfontdatabase_qpa.cpp => qplatformfontdatabase.cpp} (100%) rename src/platformsupport/eventdispatchers/{qunixeventdispatcher_qpa.cpp => qunixeventdispatcher.cpp} (100%) rename src/printsupport/kernel/{qplatformprintersupport_qpa.cpp => qplatformprintersupport.cpp} (100%) rename src/widgets/kernel/{qwidgetwindow_qpa.cpp => qwidgetwindow.cpp} (100%) rename src/widgets/util/{qcolormap_qpa.cpp => qcolormap.cpp} (100%) diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri index abffa2ade8..7c8e81812a 100644 --- a/src/gui/accessible/accessible.pri +++ b/src/gui/accessible/accessible.pri @@ -12,7 +12,7 @@ contains(QT_CONFIG, accessibility) { accessible/qaccessible2.cpp \ accessible/qaccessibleobject.cpp \ accessible/qaccessibleplugin.cpp \ - accessible/qplatformaccessibility_qpa.cpp + accessible/qplatformaccessibility.cpp HEADERS += accessible/qaccessiblebridge.h SOURCES += accessible/qaccessiblebridge.cpp diff --git a/src/gui/accessible/qplatformaccessibility_qpa.cpp b/src/gui/accessible/qplatformaccessibility.cpp similarity index 100% rename from src/gui/accessible/qplatformaccessibility_qpa.cpp rename to src/gui/accessible/qplatformaccessibility.cpp diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index efa79b5cc0..bf798372ae 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -66,29 +66,29 @@ HEADERS += \ SOURCES += \ kernel/qclipboard_qpa.cpp \ kernel/qcursor_qpa.cpp \ - kernel/qgenericpluginfactory_qpa.cpp \ - kernel/qgenericplugin_qpa.cpp \ - kernel/qwindowsysteminterface_qpa.cpp \ - kernel/qplatforminputcontextfactory_qpa.cpp \ - kernel/qplatforminputcontextplugin_qpa.cpp \ - kernel/qplatforminputcontext_qpa.cpp \ - kernel/qplatformintegration_qpa.cpp \ - kernel/qplatformdrag_qpa.cpp \ - kernel/qplatformscreen_qpa.cpp \ - kernel/qplatformintegrationfactory_qpa.cpp \ - kernel/qplatformintegrationplugin_qpa.cpp \ - kernel/qplatformtheme_qpa.cpp \ - kernel/qplatformthemefactory_qpa.cpp \ - kernel/qplatformthemeplugin_qpa.cpp \ - kernel/qplatformwindow_qpa.cpp \ - kernel/qplatformcursor_qpa.cpp \ - kernel/qplatformclipboard_qpa.cpp \ - kernel/qplatformnativeinterface_qpa.cpp \ - kernel/qsessionmanager_qpa.cpp \ + kernel/qgenericpluginfactory.cpp \ + kernel/qgenericplugin.cpp \ + kernel/qwindowsysteminterface.cpp \ + kernel/qplatforminputcontextfactory.cpp \ + kernel/qplatforminputcontextplugin.cpp \ + kernel/qplatforminputcontext.cpp \ + kernel/qplatformintegration.cpp \ + kernel/qplatformdrag.cpp \ + kernel/qplatformscreen.cpp \ + kernel/qplatformintegrationfactory.cpp \ + kernel/qplatformintegrationplugin.cpp \ + kernel/qplatformtheme.cpp \ + kernel/qplatformthemefactory.cpp \ + kernel/qplatformthemeplugin.cpp \ + kernel/qplatformwindow.cpp \ + kernel/qplatformcursor.cpp \ + kernel/qplatformclipboard.cpp \ + kernel/qplatformnativeinterface.cpp \ + kernel/qsessionmanager.cpp \ kernel/qsurfaceformat.cpp \ kernel/qguiapplication.cpp \ kernel/qwindow.cpp \ - kernel/qplatformsurface_qpa.cpp \ + kernel/qplatformsurface.cpp \ kernel/qsurface.cpp \ kernel/qclipboard.cpp \ kernel/qcursor.cpp \ @@ -105,10 +105,10 @@ SOURCES += \ kernel/qshortcutmap.cpp \ kernel/qstylehints.cpp \ kernel/qtouchdevice.cpp \ - kernel/qplatformsharedgraphicscache_qpa.cpp \ - kernel/qplatformdialoghelper_qpa.cpp \ - kernel/qplatformservices_qpa.cpp \ - kernel/qplatformscreenpageflipper_qpa.cpp + kernel/qplatformsharedgraphicscache.cpp \ + kernel/qplatformdialoghelper.cpp \ + kernel/qplatformservices.cpp \ + kernel/qplatformscreenpageflipper.cpp contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { HEADERS += \ @@ -117,7 +117,7 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) { kernel/qopenglcontext_p.h SOURCES += \ - kernel/qplatformopenglcontext_qpa.cpp \ + kernel/qplatformopenglcontext.cpp \ kernel/qopenglcontext.cpp } diff --git a/src/gui/kernel/qgenericplugin_qpa.cpp b/src/gui/kernel/qgenericplugin.cpp similarity index 100% rename from src/gui/kernel/qgenericplugin_qpa.cpp rename to src/gui/kernel/qgenericplugin.cpp diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.cpp b/src/gui/kernel/qgenericpluginfactory.cpp similarity index 100% rename from src/gui/kernel/qgenericpluginfactory_qpa.cpp rename to src/gui/kernel/qgenericpluginfactory.cpp diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/kernel/qplatformclipboard.cpp similarity index 100% rename from src/gui/kernel/qplatformclipboard_qpa.cpp rename to src/gui/kernel/qplatformclipboard.cpp diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor.cpp similarity index 100% rename from src/gui/kernel/qplatformcursor_qpa.cpp rename to src/gui/kernel/qplatformcursor.cpp diff --git a/src/gui/kernel/qplatformdialoghelper_qpa.cpp b/src/gui/kernel/qplatformdialoghelper.cpp similarity index 100% rename from src/gui/kernel/qplatformdialoghelper_qpa.cpp rename to src/gui/kernel/qplatformdialoghelper.cpp diff --git a/src/gui/kernel/qplatformdrag_qpa.cpp b/src/gui/kernel/qplatformdrag.cpp similarity index 100% rename from src/gui/kernel/qplatformdrag_qpa.cpp rename to src/gui/kernel/qplatformdrag.cpp diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext.cpp similarity index 100% rename from src/gui/kernel/qplatforminputcontext_qpa.cpp rename to src/gui/kernel/qplatforminputcontext.cpp diff --git a/src/gui/kernel/qplatforminputcontextfactory_qpa.cpp b/src/gui/kernel/qplatforminputcontextfactory.cpp similarity index 100% rename from src/gui/kernel/qplatforminputcontextfactory_qpa.cpp rename to src/gui/kernel/qplatforminputcontextfactory.cpp diff --git a/src/gui/kernel/qplatforminputcontextplugin_qpa.cpp b/src/gui/kernel/qplatforminputcontextplugin.cpp similarity index 100% rename from src/gui/kernel/qplatforminputcontextplugin_qpa.cpp rename to src/gui/kernel/qplatforminputcontextplugin.cpp diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration.cpp similarity index 100% rename from src/gui/kernel/qplatformintegration_qpa.cpp rename to src/gui/kernel/qplatformintegration.cpp diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/kernel/qplatformintegrationfactory.cpp similarity index 100% rename from src/gui/kernel/qplatformintegrationfactory_qpa.cpp rename to src/gui/kernel/qplatformintegrationfactory.cpp diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp b/src/gui/kernel/qplatformintegrationplugin.cpp similarity index 100% rename from src/gui/kernel/qplatformintegrationplugin_qpa.cpp rename to src/gui/kernel/qplatformintegrationplugin.cpp diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface.cpp similarity index 100% rename from src/gui/kernel/qplatformnativeinterface_qpa.cpp rename to src/gui/kernel/qplatformnativeinterface.cpp diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.cpp b/src/gui/kernel/qplatformopenglcontext.cpp similarity index 100% rename from src/gui/kernel/qplatformopenglcontext_qpa.cpp rename to src/gui/kernel/qplatformopenglcontext.cpp diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/kernel/qplatformscreen.cpp similarity index 100% rename from src/gui/kernel/qplatformscreen_qpa.cpp rename to src/gui/kernel/qplatformscreen.cpp diff --git a/src/gui/kernel/qplatformscreenpageflipper_qpa.cpp b/src/gui/kernel/qplatformscreenpageflipper.cpp similarity index 100% rename from src/gui/kernel/qplatformscreenpageflipper_qpa.cpp rename to src/gui/kernel/qplatformscreenpageflipper.cpp diff --git a/src/gui/kernel/qplatformservices_qpa.cpp b/src/gui/kernel/qplatformservices.cpp similarity index 100% rename from src/gui/kernel/qplatformservices_qpa.cpp rename to src/gui/kernel/qplatformservices.cpp diff --git a/src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp b/src/gui/kernel/qplatformsharedgraphicscache.cpp similarity index 100% rename from src/gui/kernel/qplatformsharedgraphicscache_qpa.cpp rename to src/gui/kernel/qplatformsharedgraphicscache.cpp diff --git a/src/gui/kernel/qplatformsurface_qpa.cpp b/src/gui/kernel/qplatformsurface.cpp similarity index 100% rename from src/gui/kernel/qplatformsurface_qpa.cpp rename to src/gui/kernel/qplatformsurface.cpp diff --git a/src/gui/kernel/qplatformtheme_qpa.cpp b/src/gui/kernel/qplatformtheme.cpp similarity index 100% rename from src/gui/kernel/qplatformtheme_qpa.cpp rename to src/gui/kernel/qplatformtheme.cpp diff --git a/src/gui/kernel/qplatformthemefactory_qpa.cpp b/src/gui/kernel/qplatformthemefactory.cpp similarity index 100% rename from src/gui/kernel/qplatformthemefactory_qpa.cpp rename to src/gui/kernel/qplatformthemefactory.cpp diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.cpp b/src/gui/kernel/qplatformthemeplugin.cpp similarity index 100% rename from src/gui/kernel/qplatformthemeplugin_qpa.cpp rename to src/gui/kernel/qplatformthemeplugin.cpp diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/kernel/qplatformwindow.cpp similarity index 100% rename from src/gui/kernel/qplatformwindow_qpa.cpp rename to src/gui/kernel/qplatformwindow.cpp diff --git a/src/gui/kernel/qsessionmanager_qpa.cpp b/src/gui/kernel/qsessionmanager.cpp similarity index 100% rename from src/gui/kernel/qsessionmanager_qpa.cpp rename to src/gui/kernel/qsessionmanager.cpp diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/kernel/qwindowsysteminterface.cpp similarity index 100% rename from src/gui/kernel/qwindowsysteminterface_qpa.cpp rename to src/gui/kernel/qwindowsysteminterface.cpp diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 6db0d341ec..cace864906 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -83,7 +83,7 @@ SOURCES += \ painting/qstroker.cpp \ painting/qtextureglyphcache.cpp \ painting/qtransform.cpp \ - painting/qplatformbackingstore_qpa.cpp \ + painting/qplatformbackingstore.cpp \ painting/qpaintbuffer.cpp \ painting/qpathsimplifier.cpp diff --git a/src/gui/painting/qplatformbackingstore_qpa.cpp b/src/gui/painting/qplatformbackingstore.cpp similarity index 100% rename from src/gui/painting/qplatformbackingstore_qpa.cpp rename to src/gui/painting/qplatformbackingstore.cpp diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase.cpp similarity index 100% rename from src/gui/text/qplatformfontdatabase_qpa.cpp rename to src/gui/text/qplatformfontdatabase.cpp diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 4cf58fadcd..fb46642b31 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -86,7 +86,7 @@ contains(QT_CONFIG, directwrite) { SOURCES += \ text/qfont_qpa.cpp \ text/qfontengine_qpa.cpp \ - text/qplatformfontdatabase_qpa.cpp \ + text/qplatformfontdatabase.cpp \ text/qrawfont_qpa.cpp HEADERS += \ diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri index 9e6ff282ce..6e16a46b34 100644 --- a/src/platformsupport/eventdispatchers/eventdispatchers.pri +++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri @@ -1,6 +1,6 @@ unix { SOURCES +=\ - $$PWD/qunixeventdispatcher_qpa.cpp\ + $$PWD/qunixeventdispatcher.cpp\ $$PWD/qgenericunixeventdispatcher.cpp\ HEADERS +=\ diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp similarity index 100% rename from src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa.cpp rename to src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp diff --git a/src/printsupport/kernel/kernel.pri b/src/printsupport/kernel/kernel.pri index d3c266ca2d..5f14c28616 100644 --- a/src/printsupport/kernel/kernel.pri +++ b/src/printsupport/kernel/kernel.pri @@ -17,7 +17,7 @@ SOURCES += \ $$PWD/qprinter.cpp \ $$PWD/qprinterinfo.cpp \ $$PWD/qplatformprintplugin.cpp \ - $$PWD/qplatformprintersupport_qpa.cpp + $$PWD/qplatformprintersupport.cpp win32 { HEADERS += \ diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport.cpp similarity index 100% rename from src/printsupport/kernel/qplatformprintersupport_qpa.cpp rename to src/printsupport/kernel/qplatformprintersupport.cpp diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index ac363c5f7a..b2f05e3cab 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -65,7 +65,7 @@ SOURCES += \ kernel/qapplication_qpa.cpp \ kernel/qdesktopwidget_qpa.cpp \ kernel/qwidget_qpa.cpp \ - kernel/qwidgetwindow_qpa.cpp + kernel/qwidgetwindow.cpp # TODO diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow.cpp similarity index 100% rename from src/widgets/kernel/qwidgetwindow_qpa.cpp rename to src/widgets/kernel/qwidgetwindow.cpp diff --git a/src/widgets/util/qcolormap_qpa.cpp b/src/widgets/util/qcolormap.cpp similarity index 100% rename from src/widgets/util/qcolormap_qpa.cpp rename to src/widgets/util/qcolormap.cpp diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri index 958958f469..08574ddd56 100644 --- a/src/widgets/util/util.pri +++ b/src/widgets/util/util.pri @@ -18,7 +18,7 @@ HEADERS += \ SOURCES += \ util/qsystemtrayicon.cpp \ - util/qcolormap_qpa.cpp \ + util/qcolormap.cpp \ util/qcompleter.cpp \ util/qscroller.cpp \ util/qscrollerproperties.cpp \