From 6fdb8bf85a4237cf774cbe68f626642ec2c9e8f6 Mon Sep 17 00:00:00 2001
From: Bo Peng <bpeng@lyx.org>
Date: Thu, 26 Apr 2007 03:53:02 +0000
Subject: [PATCH] Rename .C ==> .cpp for files in src/frontends/qt4, part one

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18014 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../cmake/src/frontends/qt4/CMakeLists.txt    |   8 +-
 development/scons/SConstruct                  |   2 +-
 development/scons/scons_manifest.py           | 318 +++++++++---------
 po/POTFILES.in                                |  82 ++---
 src/frontends/Dialogs.C                       |   2 +-
 src/frontends/Makefile.am                     |   2 +-
 src/frontends/qt4/Action.C                    |   2 +-
 src/frontends/qt4/Alert_pimpl.C               |   2 +-
 src/frontends/qt4/BulletsModule.C             |   2 +-
 src/frontends/qt4/ColorCache.C                |   2 +-
 src/frontends/qt4/Dialogs.C                   |   2 +-
 src/frontends/qt4/FileDialog.C                |   4 +-
 src/frontends/qt4/FileDialog_private.C        |   6 +-
 src/frontends/qt4/FileDialog_private.h        |   8 +-
 src/frontends/qt4/GuiApplication.C            |   2 +-
 src/frontends/qt4/GuiClipboard.C              |   2 +-
 src/frontends/qt4/GuiFontLoader.C             |   2 +-
 src/frontends/qt4/GuiFontMetrics.C            |   2 +-
 src/frontends/qt4/GuiImplementation.C         |   2 +-
 src/frontends/qt4/GuiSelection.C              |   2 +-
 src/frontends/qt4/GuiView.C                   |   2 +-
 src/frontends/qt4/GuiWorkArea.C               |   2 +-
 src/frontends/qt4/InsertTableWidget.C         |   2 +-
 src/frontends/qt4/LyXKeySymFactory.C          |   2 +-
 src/frontends/qt4/Makefile.am                 |  56 +--
 src/frontends/qt4/Makefile.dialogs            | 126 +++----
 src/frontends/qt4/QAbout.C                    |   2 +-
 src/frontends/qt4/QBibitem.C                  |   2 +-
 src/frontends/qt4/QBibtex.C                   |   6 +-
 src/frontends/qt4/QBox.C                      |   8 +-
 src/frontends/qt4/QBranch.C                   |   2 +-
 src/frontends/qt4/QBranches.C                 |   4 +-
 src/frontends/qt4/QChanges.C                  |   2 +-
 src/frontends/qt4/QCharacter.C                |   2 +-
 src/frontends/qt4/QCitation.C                 |   2 +-
 src/frontends/qt4/QCitationDialog.C           |   2 +-
 src/frontends/qt4/QCommandBuffer.C            |   2 +-
 src/frontends/qt4/QCommandEdit.C              |   2 +-
 src/frontends/qt4/QDelimiterDialog.C          |   2 +-
 src/frontends/qt4/QDialogView.C               |   2 +-
 src/frontends/qt4/QDocument.C                 |  10 +-
 src/frontends/qt4/QERT.C                      |   2 +-
 src/frontends/qt4/QErrorList.C                |   2 +-
 src/frontends/qt4/QExternal.C                 |   8 +-
 src/frontends/qt4/QFloat.C                    |   2 +-
 src/frontends/qt4/QFloatDialog.C              |   2 +-
 src/frontends/qt4/QGraphics.C                 |   8 +-
 src/frontends/qt4/QGraphicsDialog.C           |   6 +-
 src/frontends/qt4/QInclude.C                  |   6 +-
 src/frontends/qt4/QIndex.C                    |   2 +-
 src/frontends/qt4/QLImage.C                   |   2 +-
 src/frontends/qt4/QLMenubar.C                 |   2 +-
 src/frontends/qt4/QLPainter.C                 |   2 +-
 src/frontends/qt4/QLPopupMenu.C               |   2 +-
 src/frontends/qt4/QLPrintDialog.C             |   2 +-
 src/frontends/qt4/QLToolbar.C                 |   4 +-
 src/frontends/qt4/QLog.C                      |   2 +-
 src/frontends/qt4/QLyXKeySym.C                |   2 +-
 src/frontends/qt4/QMathMatrixDialog.C         |   4 +-
 src/frontends/qt4/QNomencl.C                  |   2 +-
 src/frontends/qt4/QNote.C                     |   2 +-
 src/frontends/qt4/QParagraph.C                |   2 +-
 src/frontends/qt4/QPrefs.C                    |   6 +-
 src/frontends/qt4/QPrint.C                    |   2 +-
 src/frontends/qt4/QRef.C                      |   2 +-
 src/frontends/qt4/QSearch.C                   |   2 +-
 src/frontends/qt4/QSendto.C                   |   2 +-
 src/frontends/qt4/QShowFile.C                 |   2 +-
 src/frontends/qt4/QSpellchecker.C             |   2 +-
 src/frontends/qt4/QTabular.C                  |  10 +-
 src/frontends/qt4/QTabularCreate.C            |   4 +-
 src/frontends/qt4/QTexinfo.C                  |   2 +-
 src/frontends/qt4/QThesaurus.C                |   2 +-
 src/frontends/qt4/QToc.C                      |   2 +-
 src/frontends/qt4/QURLDialog.C                |   2 +-
 src/frontends/qt4/QVSpace.C                   |   8 +-
 src/frontends/qt4/QViewSource.C               |   2 +-
 src/frontends/qt4/QWrap.C                     |   4 +-
 src/frontends/qt4/Qt2BC.C                     |   2 +-
 src/frontends/qt4/TocWidget.C                 |   2 +-
 src/frontends/qt4/UrlView.C                   |   2 +-
 src/frontends/qt4/checkedwidgets.C            |   4 +-
 src/frontends/qt4/checkedwidgets.h            |   8 +-
 src/frontends/qt4/emptytable.C                |   6 +-
 src/frontends/qt4/emptytable.h                |   2 +-
 src/frontends/qt4/iconpalette.C               |   6 +-
 src/frontends/qt4/iconpalette.h               |   2 +-
 src/frontends/qt4/lengthcombo.C               |   6 +-
 src/frontends/qt4/lengthcombo.h               |   2 +-
 src/frontends/qt4/panelstack.C                |   6 +-
 src/frontends/qt4/panelstack.h                |   2 +-
 src/frontends/qt4/qfontexample.C              |   4 +-
 src/frontends/qt4/qfontexample.h              |   2 +-
 src/frontends/qt4/qsetborder.C                |   6 +-
 src/frontends/qt4/qsetborder.h                |   2 +-
 src/frontends/qt4/qtTimeout.C                 |   2 +-
 src/frontends/qt4/qt_helpers.C                |   4 +-
 src/frontends/qt4/qt_helpers.h                |   2 +-
 src/frontends/qt4/ui/BoxUi.ui                 |   2 +-
 src/frontends/qt4/ui/DocumentUi.ui            |   2 +-
 src/frontends/qt4/ui/ExternalUi.ui            |   2 +-
 src/frontends/qt4/ui/GraphicsUi.ui            |   2 +-
 src/frontends/qt4/ui/MarginsUi.ui             |   2 +-
 src/frontends/qt4/ui/MathMatrixUi.ui          |   2 +-
 src/frontends/qt4/ui/PageLayoutUi.ui          |   2 +-
 src/frontends/qt4/ui/PrefScreenFontsUi.ui     |   2 +-
 src/frontends/qt4/ui/PrefsUi.ui               |   2 +-
 src/frontends/qt4/ui/TabularUi.ui             |   4 +-
 src/frontends/qt4/ui/TextLayoutUi.ui          |   2 +-
 src/frontends/qt4/ui/VSpaceUi.ui              |   2 +-
 src/frontends/qt4/ui/WrapUi.ui                |   2 +-
 src/frontends/qt4/validators.C                |   6 +-
 src/frontends/qt4/validators.h                |   8 +-
 113 files changed, 464 insertions(+), 464 deletions(-)

diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index b9ac5eaa9f..703c07c47f 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -32,11 +32,11 @@ include_directories(
 			${CMAKE_CURRENT_BINARY_DIR})
 
 if(MERGE_FILES)
-	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.C)
-	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.C)
+	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
+	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
 	list(REVERSE frontends_qt4_sources)
-	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.C)
-	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.C)
+	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
+	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
 	lyx_const_touched_files(_allinone frontends_qt4_sources)
 	set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
 	SET_SOURCE_FILES_PROPERTIES(_allinone_const.C PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 127b8402dc..591c27700f 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1732,7 +1732,7 @@ if build_qt4:
     #
     # moc qt4_moc_files, the moced files are included in the original files
     #
-    qt4_moced_files = [frontend_env.Moc4(x.replace('.C', '_moc.cpp'), x.replace('.C', '.h')) for x in qt4_moc_files]
+    qt4_moced_files = [frontend_env.Moc4(x.replace('.cpp', '_moc.cpp'), x.replace('.cpp', '.h')) for x in qt4_moc_files]
 
     qt4 = frontend_env.StaticLibrary(
         target = '$LOCALLIBPATH/qt4',
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index bd911a4051..3fec72119f 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -661,71 +661,71 @@ src_frontends_qt4_ui_files = Split('''
 
 
 src_frontends_qt4_moc_files = Split('''
-    BulletsModule.C
-    QBox.C
-    QERT.C
-    QSearch.C
-    QSpellchecker.C
-    QTabularCreate.C
-    QTexinfo.C
-    QThesaurus.C
-    QTabular.C
-    QVSpace.C
-    QWrap.C
-    QDocument.C
-    QLog.C
-    QParagraph.C
-    QShowFile.C
-    QBibitem.C
-    QNomencl.C
-    emptytable.C
-    FileDialog_private.C
-    FloatPlacement.C
-    GuiApplication.C
-    GuiImplementation.C
-    iconpalette.C
-    lengthcombo.C
-    InsertTableWidget.C
-    panelstack.C
-    QBibtex.C
-    QBranch.C
-    QBranches.C
-    QChanges.C
-    QCharacter.C
-    QCitationDialog.C
-    QCommandBuffer.C
-    QCommandEdit.C
-    QDelimiterDialog.C
-    QErrorList.C
-    QExternal.C
-    QFloatDialog.C
-    QGraphicsDialog.C
-    QInclude.C
-    QIndex.C
-    Action.C
-    QLog.C
-    QViewSource.C
-    QLMenubar.C
-    QLPopupMenu.C
-    QLPrintDialog.C
-    QMathMatrixDialog.C
-    QNomencl.C
-    QNote.C
-    QPrefs.C
-    QRef.C
-    QSendto.C
-    qsetborder.C
-    QDialogView.C
-    TocModel.C
-    TocWidget.C
-    QToc.C
-    GuiView.C
-    QURLDialog.C
-    GuiWorkArea.C
-    QLToolbar.C
-    socket_callback.C
-    validators.C
-    QAbout.C
+    BulletsModule.cpp
+    QBox.cpp
+    QERT.cpp
+    QSearch.cpp
+    QSpellchecker.cpp
+    QTabularCreate.cpp
+    QTexinfo.cpp
+    QThesaurus.cpp
+    QTabular.cpp
+    QVSpace.cpp
+    QWrap.cpp
+    QDocument.cpp
+    QLog.cpp
+    QParagraph.cpp
+    QShowFile.cpp
+    QBibitem.cpp
+    QNomencl.cpp
+    EmptyTable.cpp
+    LyXFileDialog.cpp
+    FloatPlacement.cpp
+    GuiApplication.cpp
+    GuiImplementation.cpp
+    IconPalette.cpp
+    LengthCombo.cpp
+    InsertTableWidget.cpp
+    PanelStack.cpp
+    QBibtex.cpp
+    QBranch.cpp
+    QBranches.cpp
+    QChanges.cpp
+    QCharacter.cpp
+    QCitationDialog.cpp
+    QCommandBuffer.cpp
+    QCommandEdit.cpp
+    QDelimiterDialog.cpp
+    QErrorList.cpp
+    QExternal.cpp
+    QFloatDialog.cpp
+    QGraphicsDialog.cpp
+    QInclude.cpp
+    QIndex.cpp
+    Action.cpp
+    QLog.cpp
+    QViewSource.cpp
+    QLMenubar.cpp
+    QLPopupMenu.cpp
+    QLPrintDialog.cpp
+    QMathMatrixDialog.cpp
+    QNomencl.cpp
+    QNote.cpp
+    QPrefs.cpp
+    QRef.cpp
+    QSendto.cpp
+    QSetBorder.cpp
+    QDialogView.cpp
+    TocModel.cpp
+    TocWidget.cpp
+    QToc.cpp
+    GuiView.cpp
+    QURLDialog.cpp
+    GuiWorkArea.cpp
+    QLToolbar.cpp
+    socket_callback.cpp
+    Validator.cpp
+    QAbout.cpp
 ''')
 
 
@@ -735,7 +735,7 @@ src_frontends_qt4_header_files = Split('''
     BulletsModule.h
     ColorCache.h
     DockView.h
-    FileDialog_private.h
+    LyXFileDialog.h
     GuiApplication.h
     GuiClipboard.h
     GuiFontLoader.h
@@ -803,108 +803,108 @@ src_frontends_qt4_header_files = Split('''
     TocModel.h
     TocWidget.h
     UrlView.h
-    checkedwidgets.h
-    emptytable.h
+    CheckedLineEdit.h
+    EmptyTable.h
     FloatPlacement.h
-    iconpalette.h
-    lengthcombo.h
-    panelstack.h
-    qfontexample.h
+    IconPalette.h
+    LengthCombo.h
+    PanelStack.h
+    QFontExample.h
     qlkey.h
-    qsetborder.h
+    QSetBorder.h
     qtTimeout.h
     qt_helpers.h
     socket_callback.h
-    validators.h
+    Validator.h
 ''')
 
 
 src_frontends_qt4_files = Split('''
-    Action.C
-    Alert_pimpl.C
-    BulletsModule.C
-    ColorCache.C
-    Dialogs.C
-    FileDialog.C
-    FileDialog_private.C
-    GuiApplication.C
-    GuiClipboard.C
-    GuiFontLoader.C
-    GuiFontMetrics.C
-    GuiImplementation.C
-    GuiSelection.C
-    GuiView.C
-    GuiWorkArea.C
-    InsertTableWidget.C
-    LyXKeySymFactory.C
-    QAbout.C
-    QBibitem.C
-    QBibtex.C
-    QBox.C
-    QBranch.C
-    QBranches.C
-    QChanges.C
-    QCharacter.C
-    QCitation.C
-    QCitationDialog.C
-    QCommandBuffer.C
-    QCommandEdit.C
-    QDelimiterDialog.C
-    QDialogView.C
-    QDocument.C
-    QERT.C
-    QErrorList.C
-    QExternal.C
-    QFloat.C
-    QFloatDialog.C
-    QGraphics.C
-    QGraphicsDialog.C
-    QInclude.C
-    QIndex.C
-    QLImage.C
-    QLMenubar.C
-    QLPainter.C
-    QLPopupMenu.C
-    QLPrintDialog.C
-    QLToolbar.C
-    QLog.C
-    QLyXKeySym.C
-    QMathMatrixDialog.C
-    QNomencl.C
-    QNote.C
-    QParagraph.C
-    QPrefs.C
-    QPrint.C
-    QRef.C
-    QSearch.C
-    QSendto.C
-    QShowFile.C
-    QSpellchecker.C
-    QTabular.C
-    QTabularCreate.C
-    QTexinfo.C
-    QThesaurus.C
-    QToc.C
-    QURLDialog.C
-    QVSpace.C
-    QViewSource.C
-    QWrap.C
-    Qt2BC.C
-    TocModel.C
-    TocWidget.C
-    UrlView.C
-    checkedwidgets.C
-    emptytable.C
-    FloatPlacement.C
-    iconpalette.C
-    lengthcombo.C
-    panelstack.C
-    qfontexample.C
-    qsetborder.C
-    qtTimeout.C
-    qt_helpers.C
-    socket_callback.C
-    validators.C
+    Action.cpp
+    Alert_pimpl.cpp
+    BulletsModule.cpp
+    ColorCache.cpp
+    Dialogs.cpp
+    FileDialog.cpp
+    LyXFileDialog.cpp
+    GuiApplication.cpp
+    GuiClipboard.cpp
+    GuiFontLoader.cpp
+    GuiFontMetrics.cpp
+    GuiImplementation.cpp
+    GuiSelection.cpp
+    GuiView.cpp
+    GuiWorkArea.cpp
+    InsertTableWidget.cpp
+    LyXKeySymFactory.cpp
+    QAbout.cpp
+    QBibitem.cpp
+    QBibtex.cpp
+    QBox.cpp
+    QBranch.cpp
+    QBranches.cpp
+    QChanges.cpp
+    QCharacter.cpp
+    QCitation.cpp
+    QCitationDialog.cpp
+    QCommandBuffer.cpp
+    QCommandEdit.cpp
+    QDelimiterDialog.cpp
+    QDialogView.cpp
+    QDocument.cpp
+    QERT.cpp
+    QErrorList.cpp
+    QExternal.cpp
+    QFloat.cpp
+    QFloatDialog.cpp
+    QGraphics.cpp
+    QGraphicsDialog.cpp
+    QInclude.cpp
+    QIndex.cpp
+    QLImage.cpp
+    QLMenubar.cpp
+    QLPainter.cpp
+    QLPopupMenu.cpp
+    QLPrintDialog.cpp
+    QLToolbar.cpp
+    QLog.cpp
+    QLyXKeySym.cpp
+    QMathMatrixDialog.cpp
+    QNomencl.cpp
+    QNote.cpp
+    QParagraph.cpp
+    QPrefs.cpp
+    QPrint.cpp
+    QRef.cpp
+    QSearch.cpp
+    QSendto.cpp
+    QShowFile.cpp
+    QSpellchecker.cpp
+    QTabular.cpp
+    QTabularCreate.cpp
+    QTexinfo.cpp
+    QThesaurus.cpp
+    QToc.cpp
+    QURLDialog.cpp
+    QVSpace.cpp
+    QViewSource.cpp
+    QWrap.cpp
+    Qt2BC.cpp
+    TocModel.cpp
+    TocWidget.cpp
+    UrlView.cpp
+    CheckedLineEdit.cpp
+    EmptyTable.cpp
+    FloatPlacement.cpp
+    IconPalette.cpp
+    LengthCombo.cpp
+    PanelStack.cpp
+    QFontExample.cpp
+    QSetBorder.cpp
+    qtTimeout.cpp
+    qt_helpers.cpp
+    socket_callback.cpp
+    Validator.cpp
 ''')
 
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index be1703a653..7ab43d7291 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -31,48 +31,48 @@ src/frontends/controllers/ControlPrint.cpp
 src/frontends/controllers/ControlSpellchecker.cpp
 src/frontends/controllers/ControlToc.cpp
 src/frontends/controllers/frontend_helpers.cpp
-src/frontends/qt4/Alert_pimpl.C
-src/frontends/qt4/BulletsModule.C
-src/frontends/qt4/Dialogs.C
-src/frontends/qt4/FileDialog.C
-src/frontends/qt4/GuiView.C
-src/frontends/qt4/GuiWorkArea.C
-src/frontends/qt4/QAbout.C
-src/frontends/qt4/QBibitem.C
-src/frontends/qt4/QBibtex.C
-src/frontends/qt4/QBox.C
-src/frontends/qt4/QBranch.C
-src/frontends/qt4/QBranches.C
-src/frontends/qt4/QChanges.C
-src/frontends/qt4/QCharacter.C
-src/frontends/qt4/QCitationDialog.C
-src/frontends/qt4/QCommandBuffer.C
-src/frontends/qt4/QDelimiterDialog.C
-src/frontends/qt4/QDocument.C
-src/frontends/qt4/QERT.C
-src/frontends/qt4/QExternal.C
-src/frontends/qt4/QFloat.C
-src/frontends/qt4/QGraphics.C
-src/frontends/qt4/QInclude.C
-src/frontends/qt4/QMathMatrixDialog.C
-src/frontends/qt4/QNote.C
-src/frontends/qt4/QParagraph.C
-src/frontends/qt4/QPrefs.C
-src/frontends/qt4/QPrint.C
-src/frontends/qt4/QRef.C
-src/frontends/qt4/QSearch.C
-src/frontends/qt4/QSendto.C
-src/frontends/qt4/QShowFile.C
-src/frontends/qt4/QSpellchecker.C
-src/frontends/qt4/QTabular.C
-src/frontends/qt4/QTabularCreate.C
-src/frontends/qt4/QTexinfo.C
-src/frontends/qt4/QThesaurus.C
-src/frontends/qt4/QVSpace.C
-src/frontends/qt4/QWrap.C
+src/frontends/qt4/Alert_pimpl.cpp
+src/frontends/qt4/BulletsModule.cpp
+src/frontends/qt4/Dialogs.cpp
+src/frontends/qt4/FileDialog.cpp
+src/frontends/qt4/GuiView.cpp
+src/frontends/qt4/GuiWorkArea.cpp
+src/frontends/qt4/QAbout.cpp
+src/frontends/qt4/QBibitem.cpp
+src/frontends/qt4/QBibtex.cpp
+src/frontends/qt4/QBox.cpp
+src/frontends/qt4/QBranch.cpp
+src/frontends/qt4/QBranches.cpp
+src/frontends/qt4/QChanges.cpp
+src/frontends/qt4/QCharacter.cpp
+src/frontends/qt4/QCitationDialog.cpp
+src/frontends/qt4/QCommandBuffer.cpp
+src/frontends/qt4/QDelimiterDialog.cpp
+src/frontends/qt4/QDocument.cpp
+src/frontends/qt4/QERT.cpp
+src/frontends/qt4/QExternal.cpp
+src/frontends/qt4/QFloat.cpp
+src/frontends/qt4/QGraphics.cpp
+src/frontends/qt4/QInclude.cpp
+src/frontends/qt4/QMathMatrixDialog.cpp
+src/frontends/qt4/QNote.cpp
+src/frontends/qt4/QParagraph.cpp
+src/frontends/qt4/QPrefs.cpp
+src/frontends/qt4/QPrint.cpp
+src/frontends/qt4/QRef.cpp
+src/frontends/qt4/QSearch.cpp
+src/frontends/qt4/QSendto.cpp
+src/frontends/qt4/QShowFile.cpp
+src/frontends/qt4/QSpellchecker.cpp
+src/frontends/qt4/QTabular.cpp
+src/frontends/qt4/QTabularCreate.cpp
+src/frontends/qt4/QTexinfo.cpp
+src/frontends/qt4/QThesaurus.cpp
+src/frontends/qt4/QVSpace.cpp
+src/frontends/qt4/QWrap.cpp
 src/frontends/qt4/Qt2BC.h
-src/frontends/qt4/UrlView.C
-src/frontends/qt4/validators.C
+src/frontends/qt4/UrlView.cpp
+src/frontends/qt4/Validator.cpp
 src/gettext.h
 src/importer.C
 src/insets/InsetBase.cpp
diff --git a/src/frontends/Dialogs.C b/src/frontends/Dialogs.C
index b02cf97f6f..afd4665c84 100644
--- a/src/frontends/Dialogs.C
+++ b/src/frontends/Dialogs.C
@@ -1,5 +1,5 @@
 /**
- * \file frontends/Dialogs.C
+ * \file frontends/Dialogs.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index f9ee6a9b08..666f965305 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -20,7 +20,7 @@ libfrontends_la_SOURCES = \
 	Application.h \
 	NoGuiFontLoader.h \
 	NoGuiFontMetrics.h \
-	Dialogs.C \
+	Dialogs.cpp \
 	Dialogs.h \
 	FileDialog.h \
 	FontLoader.h \
diff --git a/src/frontends/qt4/Action.C b/src/frontends/qt4/Action.C
index b34d9543fb..66d8dc413b 100644
--- a/src/frontends/qt4/Action.C
+++ b/src/frontends/qt4/Action.C
@@ -1,5 +1,5 @@
 /**
- * \file Action.C
+ * \file Action.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/Alert_pimpl.C b/src/frontends/qt4/Alert_pimpl.C
index 0218c7c7e9..6bf50fc152 100644
--- a/src/frontends/qt4/Alert_pimpl.C
+++ b/src/frontends/qt4/Alert_pimpl.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/Alert_pimpl.C
+ * \file qt4/Alert_pimpl.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/BulletsModule.C b/src/frontends/qt4/BulletsModule.C
index 7704b80261..46cf50d547 100644
--- a/src/frontends/qt4/BulletsModule.C
+++ b/src/frontends/qt4/BulletsModule.C
@@ -1,5 +1,5 @@
 /**
- * \file BulletsModule.C
+ * \file BulletsModule.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/ColorCache.C b/src/frontends/qt4/ColorCache.C
index 5dcac2b96b..56994fd506 100644
--- a/src/frontends/qt4/ColorCache.C
+++ b/src/frontends/qt4/ColorCache.C
@@ -1,5 +1,5 @@
 /**
- * \file ColorCache.C
+ * \file ColorCache.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C
index 318507e7c1..0735eab547 100644
--- a/src/frontends/qt4/Dialogs.C
+++ b/src/frontends/qt4/Dialogs.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/Dialogs.C
+ * \file qt4/Dialogs.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/FileDialog.C b/src/frontends/qt4/FileDialog.C
index e74ccba876..bee4e6ad1f 100644
--- a/src/frontends/qt4/FileDialog.C
+++ b/src/frontends/qt4/FileDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/FileDialog.C
+ * \file qt4/FileDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 
 #include "frontends/FileDialog.h"
 
-#include "FileDialog_private.h"
+#include "LyXFileDialog.h"
 #include "qt_helpers.h"
 
 #include "debug.h"
diff --git a/src/frontends/qt4/FileDialog_private.C b/src/frontends/qt4/FileDialog_private.C
index fefa83ad4c..0d6652c9b7 100644
--- a/src/frontends/qt4/FileDialog_private.C
+++ b/src/frontends/qt4/FileDialog_private.C
@@ -1,5 +1,5 @@
 /**
- * \file FileDialog_private.C
+ * \file LyXFileDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "FileDialog_private.h"
+#include "LyXFileDialog.h"
 
 #include "qt_helpers.h"
 
@@ -84,5 +84,5 @@ void LyXFileDialog::buttonClicked()
 
 } // namespace lyx
 
-#include "FileDialog_private_moc.cpp"
+#include "LyXFileDialog_moc.cpp"
 
diff --git a/src/frontends/qt4/FileDialog_private.h b/src/frontends/qt4/FileDialog_private.h
index e697b361f0..65e2dd412a 100644
--- a/src/frontends/qt4/FileDialog_private.h
+++ b/src/frontends/qt4/FileDialog_private.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file FileDialog_private.h
+ * \file LyXFileDialog.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef FILEDIALOG_PRIVATE_H
-#define FILEDIALOG_PRIVATE_H
+#ifndef LYXFILEDIALOG_H
+#define LYXFILEDIALOG_H
 
 #include "frontends/FileDialog.h"
 
@@ -44,4 +44,4 @@ private:
 } // namespace lyx
 
 
-#endif // FILEDIALOG_PRIVATE_H
+#endif // LYXFILEDIALOG_H
diff --git a/src/frontends/qt4/GuiApplication.C b/src/frontends/qt4/GuiApplication.C
index 88f412771e..b8011a8811 100644
--- a/src/frontends/qt4/GuiApplication.C
+++ b/src/frontends/qt4/GuiApplication.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/GuiApplication.C
+ * \file qt4/GuiApplication.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/GuiClipboard.C b/src/frontends/qt4/GuiClipboard.C
index 03c1c2b40f..dfb4665233 100644
--- a/src/frontends/qt4/GuiClipboard.C
+++ b/src/frontends/qt4/GuiClipboard.C
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qt4/GuiClipboard.C
+ * \file qt4/GuiClipboard.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/GuiFontLoader.C b/src/frontends/qt4/GuiFontLoader.C
index 2c473882fc..f5cc8c9a5a 100644
--- a/src/frontends/qt4/GuiFontLoader.C
+++ b/src/frontends/qt4/GuiFontLoader.C
@@ -1,5 +1,5 @@
 /**
- * \file GuiFontLoader.C
+ * \file GuiFontLoader.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/GuiFontMetrics.C b/src/frontends/qt4/GuiFontMetrics.C
index 0421b5a059..cf38d4d9c1 100644
--- a/src/frontends/qt4/GuiFontMetrics.C
+++ b/src/frontends/qt4/GuiFontMetrics.C
@@ -1,5 +1,5 @@
 /**
- * \file GuiFontMetrics.C
+ * \file GuiFontMetrics.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/GuiImplementation.C b/src/frontends/qt4/GuiImplementation.C
index de37f50254..18ae534f41 100644
--- a/src/frontends/qt4/GuiImplementation.C
+++ b/src/frontends/qt4/GuiImplementation.C
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file GuiImplementation.C
+ * \file GuiImplementation.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/GuiSelection.C b/src/frontends/qt4/GuiSelection.C
index 16506d4718..17c60b3d82 100644
--- a/src/frontends/qt4/GuiSelection.C
+++ b/src/frontends/qt4/GuiSelection.C
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qt4/GuiSelection.C
+ * \file qt4/GuiSelection.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/GuiView.C b/src/frontends/qt4/GuiView.C
index 763ad229a2..113f1432cf 100644
--- a/src/frontends/qt4/GuiView.C
+++ b/src/frontends/qt4/GuiView.C
@@ -1,5 +1,5 @@
 /**
- * \file GuiView.C
+ * \file GuiView.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/GuiWorkArea.C b/src/frontends/qt4/GuiWorkArea.C
index a06303ab73..436e7f1333 100644
--- a/src/frontends/qt4/GuiWorkArea.C
+++ b/src/frontends/qt4/GuiWorkArea.C
@@ -1,5 +1,5 @@
 /**
- * \file GuiWorkArea.C
+ * \file GuiWorkArea.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/InsertTableWidget.C b/src/frontends/qt4/InsertTableWidget.C
index 0868c6353a..de8a31768f 100644
--- a/src/frontends/qt4/InsertTableWidget.C
+++ b/src/frontends/qt4/InsertTableWidget.C
@@ -1,5 +1,5 @@
 /**
- * \file InsertTableWidget.C
+ * \file InsertTableWidget.cpp
  *
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
diff --git a/src/frontends/qt4/LyXKeySymFactory.C b/src/frontends/qt4/LyXKeySymFactory.C
index 8e29203164..abff60d7ed 100644
--- a/src/frontends/qt4/LyXKeySymFactory.C
+++ b/src/frontends/qt4/LyXKeySymFactory.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/LyXKeySymFactory.C
+ * \file qt4/LyXKeySymFactory.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 135d7cb5fc..b8c2c8d9e3 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -30,34 +30,34 @@ AM_CPPFLAGS += \
 	-I$(top_srcdir)/src/frontends/controllers
 
 libqt4_la_SOURCES = \
-	Alert_pimpl.C \
-	ColorCache.h ColorCache.C \
+	Alert_pimpl.cpp \
+	ColorCache.h ColorCache.cpp \
 	DockView.h \
-	Dialogs.C \
-	FileDialog.C \
-	GuiClipboard.h GuiClipboard.C \
-	GuiFontLoader.h GuiFontLoader.C \
-	GuiFontMetrics.h GuiFontMetrics.C \
-	GuiSelection.h GuiSelection.C \
-	LyXKeySymFactory.C \
-	QLMenubar.C QLMenubar.h \
-	QBox.C QBox.h \
-	QBranches.C QBranches.h \
-	QCitation.C QCitation.h \
-	QDialogView.C QDialogView.h \
-	QFloat.C QFloat.h \
-	QGraphics.C QGraphics.h \
-	QLImage.C QLImage.h \
-	QViewSource.C QViewSource.h \
-	QLPainter.C QLPainter.h \
-	QLyXKeySym.C QLyXKeySym.h \
-	QPrint.C QPrint.h \
-	Qt2BC.C	Qt2BC.h	\
-	checkedwidgets.C checkedwidgets.h \
-	panelstack.h panelstack.C \
-	qfontexample.h qfontexample.C \
+	Dialogs.cpp \
+	FileDialog.cpp \
+	GuiClipboard.h GuiClipboard.cpp \
+	GuiFontLoader.h GuiFontLoader.cpp \
+	GuiFontMetrics.h GuiFontMetrics.cpp \
+	GuiSelection.h GuiSelection.cpp \
+	LyXKeySymFactory.cpp \
+	QLMenubar.cpp QLMenubar.h \
+	QBox.cpp QBox.h \
+	QBranches.cpp QBranches.h \
+	QCitation.cpp QCitation.h \
+	QDialogView.cpp QDialogView.h \
+	QFloat.cpp QFloat.h \
+	QGraphics.cpp QGraphics.h \
+	QLImage.cpp QLImage.h \
+	QViewSource.cpp QViewSource.h \
+	QLPainter.cpp QLPainter.h \
+	QLyXKeySym.cpp QLyXKeySym.h \
+	QPrint.cpp QPrint.h \
+	Qt2BC.cpp	Qt2BC.h	\
+	CheckedLineEdit.cpp CheckedLineEdit.h \
+	PanelStack.h PanelStack.cpp \
+	QFontExample.h QFontExample.cpp \
 	qlkey.h \
-	qt_helpers.h qt_helpers.C \
-	qtTimeout.C qtTimeout.h \
-	UrlView.C UrlView.h \
+	qt_helpers.h qt_helpers.cpp \
+	qtTimeout.cpp qtTimeout.h \
+	UrlView.cpp UrlView.h \
 	$(MOCFILES)
diff --git a/src/frontends/qt4/Makefile.dialogs b/src/frontends/qt4/Makefile.dialogs
index 02e37469a8..59722f3a8c 100644
--- a/src/frontends/qt4/Makefile.dialogs
+++ b/src/frontends/qt4/Makefile.dialogs
@@ -73,66 +73,66 @@ UIFILES = \
 	WrapUi.ui
 
 MOCFILES = \
-	Action.C Action.h \
-	BulletsModule.C BulletsModule.h \
-	emptytable.C emptytable.h \
-	FileDialog_private.C FileDialog_private.h \
-	FloatPlacement.C FloatPlacement.h \
-	GuiApplication.C GuiApplication.h \
-	GuiImplementation.C GuiImplementation.h \
-	GuiView.C GuiView.h \
-	GuiWorkArea.C GuiWorkArea.h \
-	iconpalette.C iconpalette.h \
-	InsertTableWidget.C InsertTableWidget.h \
-	lengthcombo.C lengthcombo.h \
-	panelstack.C panelstack.h \
-	QAbout.C QAbout.h \
-	QBibitem.C QBibitem.h \
-	QBibtex.C QBibtex.h \
-	QBox.C QBox.h \
-	QBranch.C QBranch.h \
-	QBranches.C QBranches.h \
-	QChanges.C QChanges.h \
-	QCharacter.C QCharacter.h \
-	QCitationDialog.C QCitationDialog.h \
-	QCommandBuffer.C QCommandBuffer.h \
-	QCommandEdit.C QCommandEdit.h \
-	QDelimiterDialog.C QDelimiterDialog.h \
-	QDocument.C QDocument.h \
-	QErrorList.C QErrorList.h \
-	QERT.C QERT.h \
-	QExternal.C QExternal.h \
-	QFloatDialog.C QFloatDialog.h \
-	QGraphicsDialog.C QGraphicsDialog.h \
-	QInclude.C QInclude.h \
-	QIndex.C QIndex.h \
-	QLog.C QLog.h \
-	QViewSource.C QViewSource.h \
-	QLMenubar.C QLMenubar.h \
-	QLPopupMenu.C QLPopupMenu.h \
-	QLPrintDialog.C QLPrintDialog.h \
-	QMathMatrixDialog.C QMathMatrixDialog.h \
-	QNomencl.C QNomencl.h \
-	QNote.C QNote.h \
-	QParagraph.C QParagraph.h \
-	QPrefs.C QPrefs.h \
-	QRef.C QRef.h \
-	QSearch.C QSearch.h \
-	QSendto.C QSendto.h \
-	qsetborder.C qsetborder.h \
-	QShowFile.C QShowFile.h \
-	QSpellchecker.C QSpellchecker.h \
-	QDialogView.C QDialogView.h \
-	QTabularCreate.C QTabularCreate.h \
-	QTabular.C QTabular.h \
-	QTexinfo.C QTexinfo.h \
-	QThesaurus.C QThesaurus.h \
-	TocModel.C TocModel.h \
-	TocWidget.C TocWidget.h \
-	QToc.C QToc.h \
-	QURLDialog.C QURLDialog.h \
-	QVSpace.C QVSpace.h \
-	QWrap.C QWrap.h \
-	QLToolbar.C QLToolbar.h \
-	socket_callback.C socket_callback.h \
-	validators.C validators.h
+	Action.cpp Action.h \
+	BulletsModule.cpp BulletsModule.h \
+	EmptyTable.cpp EmptyTable.h \
+	LyXFileDialog.cpp LyXFileDialog.h \
+	FloatPlacement.cpp FloatPlacement.h \
+	GuiApplication.cpp GuiApplication.h \
+	GuiImplementation.cpp GuiImplementation.h \
+	GuiView.cpp GuiView.h \
+	GuiWorkArea.cpp GuiWorkArea.h \
+	IconPalette.cpp IconPalette.h \
+	InsertTableWidget.cpp InsertTableWidget.h \
+	LengthCombo.cpp LengthCombo.h \
+	PanelStack.cpp PanelStack.h \
+	QAbout.cpp QAbout.h \
+	QBibitem.cpp QBibitem.h \
+	QBibtex.cpp QBibtex.h \
+	QBox.cpp QBox.h \
+	QBranch.cpp QBranch.h \
+	QBranches.cpp QBranches.h \
+	QChanges.cpp QChanges.h \
+	QCharacter.cpp QCharacter.h \
+	QCitationDialog.cpp QCitationDialog.h \
+	QCommandBuffer.cpp QCommandBuffer.h \
+	QCommandEdit.cpp QCommandEdit.h \
+	QDelimiterDialog.cpp QDelimiterDialog.h \
+	QDocument.cpp QDocument.h \
+	QErrorList.cpp QErrorList.h \
+	QERT.cpp QERT.h \
+	QExternal.cpp QExternal.h \
+	QFloatDialog.cpp QFloatDialog.h \
+	QGraphicsDialog.cpp QGraphicsDialog.h \
+	QInclude.cpp QInclude.h \
+	QIndex.cpp QIndex.h \
+	QLog.cpp QLog.h \
+	QViewSource.cpp QViewSource.h \
+	QLMenubar.cpp QLMenubar.h \
+	QLPopupMenu.cpp QLPopupMenu.h \
+	QLPrintDialog.cpp QLPrintDialog.h \
+	QMathMatrixDialog.cpp QMathMatrixDialog.h \
+	QNomencl.cpp QNomencl.h \
+	QNote.cpp QNote.h \
+	QParagraph.cpp QParagraph.h \
+	QPrefs.cpp QPrefs.h \
+	QRef.cpp QRef.h \
+	QSearch.cpp QSearch.h \
+	QSendto.cpp QSendto.h \
+	QSetBorder.cpp QSetBorder.h \
+	QShowFile.cpp QShowFile.h \
+	QSpellchecker.cpp QSpellchecker.h \
+	QDialogView.cpp QDialogView.h \
+	QTabularCreate.cpp QTabularCreate.h \
+	QTabular.cpp QTabular.h \
+	QTexinfo.cpp QTexinfo.h \
+	QThesaurus.cpp QThesaurus.h \
+	TocModel.cpp TocModel.h \
+	TocWidget.cpp TocWidget.h \
+	QToc.cpp QToc.h \
+	QURLDialog.cpp QURLDialog.h \
+	QVSpace.cpp QVSpace.h \
+	QWrap.cpp QWrap.h \
+	QLToolbar.cpp QLToolbar.h \
+	socket_callback.cpp socket_callback.h \
+	Validator.cpp Validator.h
diff --git a/src/frontends/qt4/QAbout.C b/src/frontends/qt4/QAbout.C
index 4a12c47c3d..05901ec997 100644
--- a/src/frontends/qt4/QAbout.C
+++ b/src/frontends/qt4/QAbout.C
@@ -1,5 +1,5 @@
 /**
- * \file QAbout.C
+ * \file QAbout.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QBibitem.C b/src/frontends/qt4/QBibitem.C
index 953ff0583b..6e29d582d0 100644
--- a/src/frontends/qt4/QBibitem.C
+++ b/src/frontends/qt4/QBibitem.C
@@ -1,5 +1,5 @@
 /**
- * \file QBibitem.C
+ * \file QBibitem.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QBibtex.C b/src/frontends/qt4/QBibtex.C
index 61b428d592..4d8ef8a8b8 100644
--- a/src/frontends/qt4/QBibtex.C
+++ b/src/frontends/qt4/QBibtex.C
@@ -1,5 +1,5 @@
 /**
- * \file QBibtex.C
+ * \file QBibtex.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -17,9 +17,9 @@
 #include "ui/BibtexAddUi.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
-#include "validators.h"
+#include "Validator.h"
 #include "lyxrc.h"
-#include "checkedwidgets.h"
+#include "CheckedLineEdit.h"
 
 #include "controllers/ControlBibtex.h"
 #include "controllers/ButtonPolicies.h"
diff --git a/src/frontends/qt4/QBox.C b/src/frontends/qt4/QBox.C
index 29db7d07d4..d62c78e0df 100644
--- a/src/frontends/qt4/QBox.C
+++ b/src/frontends/qt4/QBox.C
@@ -1,5 +1,5 @@
 /**
- * \file QBox.C
+ * \file QBox.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,13 +14,13 @@
 
 #include "QBox.h"
 
-#include "checkedwidgets.h"
-#include "lengthcombo.h"
+#include "CheckedLineEdit.h"
+#include "LengthCombo.h"
 #include "qt_helpers.h"
 #include "Qt2BC.h"
 #include "lengthcommon.h"
 #include "lyxrc.h" // to set the default length values
-#include "validators.h"
+#include "Validator.h"
 
 #include "controllers/ControlBox.h"
 #include "controllers/frontend_helpers.h"
diff --git a/src/frontends/qt4/QBranch.C b/src/frontends/qt4/QBranch.C
index ae55af805a..757a69cdad 100644
--- a/src/frontends/qt4/QBranch.C
+++ b/src/frontends/qt4/QBranch.C
@@ -1,5 +1,5 @@
 /**
- * \file QBranch.C
+ * \file QBranch.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QBranches.C b/src/frontends/qt4/QBranches.C
index de5c111139..49a5682081 100644
--- a/src/frontends/qt4/QBranches.C
+++ b/src/frontends/qt4/QBranches.C
@@ -1,5 +1,5 @@
 /**
- * \file QBranches.C
+ * \file QBranches.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 #include "QBranches.h"
 
 #include "GuiApplication.h"
-#include "validators.h"
+#include "Validator.h"
 #include "qt_helpers.h"
 
 #include "bufferparams.h"
diff --git a/src/frontends/qt4/QChanges.C b/src/frontends/qt4/QChanges.C
index 355f2d8788..e7613e03d8 100644
--- a/src/frontends/qt4/QChanges.C
+++ b/src/frontends/qt4/QChanges.C
@@ -1,5 +1,5 @@
 /**
- * \file QChanges.C
+ * \file QChanges.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QCharacter.C b/src/frontends/qt4/QCharacter.C
index bf4244222b..86eb85f306 100644
--- a/src/frontends/qt4/QCharacter.C
+++ b/src/frontends/qt4/QCharacter.C
@@ -1,5 +1,5 @@
 /**
- * \file QCharacter.C
+ * \file QCharacter.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QCitation.C b/src/frontends/qt4/QCitation.C
index 9200704115..a5c64faca0 100644
--- a/src/frontends/qt4/QCitation.C
+++ b/src/frontends/qt4/QCitation.C
@@ -1,5 +1,5 @@
 /*
- * \file QCitation.C
+ * \file QCitation.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QCitationDialog.C b/src/frontends/qt4/QCitationDialog.C
index b0ccf8e038..b7ace68297 100644
--- a/src/frontends/qt4/QCitationDialog.C
+++ b/src/frontends/qt4/QCitationDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file QCitationDialog.C
+ * \file QCitationDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QCommandBuffer.C b/src/frontends/qt4/QCommandBuffer.C
index f791d5fecd..5bc8c46a03 100644
--- a/src/frontends/qt4/QCommandBuffer.C
+++ b/src/frontends/qt4/QCommandBuffer.C
@@ -1,5 +1,5 @@
 /**
- * \file QCommandBuffer.C
+ * \file QCommandBuffer.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QCommandEdit.C b/src/frontends/qt4/QCommandEdit.C
index 41eea45f74..3cd2c32430 100644
--- a/src/frontends/qt4/QCommandEdit.C
+++ b/src/frontends/qt4/QCommandEdit.C
@@ -1,5 +1,5 @@
 /**
- * \file QCommandEdit.C
+ * \file QCommandEdit.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QDelimiterDialog.C b/src/frontends/qt4/QDelimiterDialog.C
index 6c1712fbcf..e0d254a3c0 100644
--- a/src/frontends/qt4/QDelimiterDialog.C
+++ b/src/frontends/qt4/QDelimiterDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file QDelimiterDialog.C
+ * \file QDelimiterDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QDialogView.C b/src/frontends/qt4/QDialogView.C
index 28fbd6a2ef..57cd67350e 100644
--- a/src/frontends/qt4/QDialogView.C
+++ b/src/frontends/qt4/QDialogView.C
@@ -1,5 +1,5 @@
 /**
- * \file QDialogView.C
+ * \file QDialogView.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QDocument.C b/src/frontends/qt4/QDocument.C
index a61c695221..6ef51d7de0 100644
--- a/src/frontends/qt4/QDocument.C
+++ b/src/frontends/qt4/QDocument.C
@@ -1,5 +1,5 @@
 /**
- * \file QDocument.C
+ * \file QDocument.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -18,11 +18,11 @@
 #include <QCloseEvent>
 
 #include "FloatPlacement.h"
-#include "lengthcombo.h"
-#include "validators.h"
-#include "panelstack.h"
+#include "LengthCombo.h"
+#include "Validator.h"
+#include "PanelStack.h"
 #include "Qt2BC.h"
-#include "checkedwidgets.h"
+#include "CheckedLineEdit.h"
 
 // For latexHighlighter use in the preamble.
 #include "QViewSource.h"
diff --git a/src/frontends/qt4/QERT.C b/src/frontends/qt4/QERT.C
index 90c9de6dac..d1b0fceba3 100644
--- a/src/frontends/qt4/QERT.C
+++ b/src/frontends/qt4/QERT.C
@@ -1,5 +1,5 @@
 /**
- * \file QERT.C
+ * \file QERT.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QErrorList.C b/src/frontends/qt4/QErrorList.C
index f5fe58d7d1..c4f73fbc18 100644
--- a/src/frontends/qt4/QErrorList.C
+++ b/src/frontends/qt4/QErrorList.C
@@ -1,5 +1,5 @@
 /**
- * \file QErrorList.C
+ * \file QErrorList.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QExternal.C b/src/frontends/qt4/QExternal.C
index 460d8802e3..d33d91c6a6 100644
--- a/src/frontends/qt4/QExternal.C
+++ b/src/frontends/qt4/QExternal.C
@@ -1,5 +1,5 @@
 /**
- * \file QExternal.C
+ * \file QExternal.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -30,10 +30,10 @@
 #include "QExternal.h"
 #include "Qt2BC.h"
 
-#include "checkedwidgets.h"
-#include "lengthcombo.h"
+#include "CheckedLineEdit.h"
+#include "LengthCombo.h"
 #include "qt_helpers.h"
-#include "validators.h"
+#include "Validator.h"
 
 #include <QLineEdit>
 #include <QPushButton>
diff --git a/src/frontends/qt4/QFloat.C b/src/frontends/qt4/QFloat.C
index fb14eedc10..c3e2c14a62 100644
--- a/src/frontends/qt4/QFloat.C
+++ b/src/frontends/qt4/QFloat.C
@@ -1,5 +1,5 @@
 /**
- * \file QFloat.C
+ * \file QFloat.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QFloatDialog.C b/src/frontends/qt4/QFloatDialog.C
index caa05f51a3..c32ba45290 100644
--- a/src/frontends/qt4/QFloatDialog.C
+++ b/src/frontends/qt4/QFloatDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file QFloatDialog.C
+ * \file QFloatDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QGraphics.C b/src/frontends/qt4/QGraphics.C
index 2d55627967..5e1e100b61 100644
--- a/src/frontends/qt4/QGraphics.C
+++ b/src/frontends/qt4/QGraphics.C
@@ -1,5 +1,5 @@
 /**
- * \file QGraphics.C
+ * \file QGraphics.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -15,12 +15,12 @@
 
 #include "QGraphics.h"
 
-#include "checkedwidgets.h"
-#include "lengthcombo.h"
+#include "CheckedLineEdit.h"
+#include "LengthCombo.h"
 #include "QGraphicsDialog.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
-#include "validators.h"
+#include "Validator.h"
 
 #include "lengthcommon.h"
 #include "lyxrc.h"
diff --git a/src/frontends/qt4/QGraphicsDialog.C b/src/frontends/qt4/QGraphicsDialog.C
index ba98ed817c..3aaaebcba3 100644
--- a/src/frontends/qt4/QGraphicsDialog.C
+++ b/src/frontends/qt4/QGraphicsDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file QGraphicsDialog.C
+ * \file QGraphicsDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -16,8 +16,8 @@
 #include "QGraphicsDialog.h"
 #include "QGraphics.h"
 
-#include "lengthcombo.h"
-#include "validators.h"
+#include "LengthCombo.h"
+#include "Validator.h"
 #include "qt_helpers.h"
 
 #include "debug.h"
diff --git a/src/frontends/qt4/QInclude.C b/src/frontends/qt4/QInclude.C
index 7beb3fa720..a701814564 100644
--- a/src/frontends/qt4/QInclude.C
+++ b/src/frontends/qt4/QInclude.C
@@ -1,5 +1,5 @@
 /**
- * \file QInclude.C
+ * \file QInclude.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,10 +14,10 @@
 
 #include "QInclude.h"
 
-#include "checkedwidgets.h"
+#include "CheckedLineEdit.h"
 #include "Qt2BC.h"
 #include "qt_helpers.h"
-#include "validators.h"
+#include "Validator.h"
 
 #include "lyxrc.h"
 
diff --git a/src/frontends/qt4/QIndex.C b/src/frontends/qt4/QIndex.C
index f403a4029b..3eb8d1b214 100644
--- a/src/frontends/qt4/QIndex.C
+++ b/src/frontends/qt4/QIndex.C
@@ -1,5 +1,5 @@
 /**
- * \file QIndex.C
+ * \file QIndex.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QLImage.C b/src/frontends/qt4/QLImage.C
index 18aa9f9bd0..6a6c39cc0a 100644
--- a/src/frontends/qt4/QLImage.C
+++ b/src/frontends/qt4/QLImage.C
@@ -1,5 +1,5 @@
 /**
- * \file QLImage.C
+ * \file QLImage.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QLMenubar.C b/src/frontends/qt4/QLMenubar.C
index 95789bfd9b..9c8b5ab0c4 100644
--- a/src/frontends/qt4/QLMenubar.C
+++ b/src/frontends/qt4/QLMenubar.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/QLMenubar.C
+ * \file qt4/QLMenubar.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C
index 396c0d8b7e..8bec6aecec 100644
--- a/src/frontends/qt4/QLPainter.C
+++ b/src/frontends/qt4/QLPainter.C
@@ -1,5 +1,5 @@
 /**
- * \file QLPainter.C
+ * \file QLPainter.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QLPopupMenu.C b/src/frontends/qt4/QLPopupMenu.C
index f3b6d1f007..f58364209d 100644
--- a/src/frontends/qt4/QLPopupMenu.C
+++ b/src/frontends/qt4/QLPopupMenu.C
@@ -1,5 +1,5 @@
 /**
- * \file QLPopupMenu.C
+ * \file QLPopupMenu.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QLPrintDialog.C b/src/frontends/qt4/QLPrintDialog.C
index ca408b5c91..85d8126752 100644
--- a/src/frontends/qt4/QLPrintDialog.C
+++ b/src/frontends/qt4/QLPrintDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file QLPrintDialog.C
+ * \file QLPrintDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QLToolbar.C b/src/frontends/qt4/QLToolbar.C
index 756d6d0560..65af778356 100644
--- a/src/frontends/qt4/QLToolbar.C
+++ b/src/frontends/qt4/QLToolbar.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/QLToolbar.C
+ * \file qt4/QLToolbar.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -21,7 +21,7 @@
 #include "FuncStatus.h"
 #include "gettext.h"
 #include "lyxfunc.h"
-#include "iconpalette.h"
+#include "IconPalette.h"
 
 #include "GuiView.h"
 #include "QLToolbar.h"
diff --git a/src/frontends/qt4/QLog.C b/src/frontends/qt4/QLog.C
index dcd519a53c..4ca0adc1f8 100644
--- a/src/frontends/qt4/QLog.C
+++ b/src/frontends/qt4/QLog.C
@@ -1,5 +1,5 @@
 /**
- * \file QLog.C
+ * \file QLog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QLyXKeySym.C b/src/frontends/qt4/QLyXKeySym.C
index 8651f41dd4..524e1d14f6 100644
--- a/src/frontends/qt4/QLyXKeySym.C
+++ b/src/frontends/qt4/QLyXKeySym.C
@@ -1,5 +1,5 @@
 /**
- * \file QLyXKeySym.C
+ * \file QLyXKeySym.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QMathMatrixDialog.C b/src/frontends/qt4/QMathMatrixDialog.C
index 1ca435794f..da3f38fdf4 100644
--- a/src/frontends/qt4/QMathMatrixDialog.C
+++ b/src/frontends/qt4/QMathMatrixDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file QMathMatrixDialog.C
+ * \file QMathMatrixDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include "QMathMatrixDialog.h"
 
-#include "emptytable.h"
+#include "EmptyTable.h"
 #include "qt_helpers.h"
 
 #include "controllers/ControlMath.h"
diff --git a/src/frontends/qt4/QNomencl.C b/src/frontends/qt4/QNomencl.C
index 010ec89c8b..6b4dd85cf3 100644
--- a/src/frontends/qt4/QNomencl.C
+++ b/src/frontends/qt4/QNomencl.C
@@ -1,5 +1,5 @@
 /**
- * \file QNomencl.C
+ * \file QNomencl.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QNote.C b/src/frontends/qt4/QNote.C
index 5ad76b77f9..1751e610d8 100644
--- a/src/frontends/qt4/QNote.C
+++ b/src/frontends/qt4/QNote.C
@@ -1,5 +1,5 @@
 /**
- * \file QNote.C
+ * \file QNote.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QParagraph.C b/src/frontends/qt4/QParagraph.C
index 1b5eae27c0..00d8ee428c 100644
--- a/src/frontends/qt4/QParagraph.C
+++ b/src/frontends/qt4/QParagraph.C
@@ -1,5 +1,5 @@
 /**
- * \file QParagraph.C
+ * \file QParagraph.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QPrefs.C b/src/frontends/qt4/QPrefs.C
index 07f66d55c2..b43678268c 100644
--- a/src/frontends/qt4/QPrefs.C
+++ b/src/frontends/qt4/QPrefs.C
@@ -1,5 +1,5 @@
 /**
- * \file QPrefs.C
+ * \file QPrefs.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -20,8 +20,8 @@
 #include "debug.h"
 #include "LColor.h"
 #include "lyxfont.h"
-#include "panelstack.h"
-#include "qfontexample.h"
+#include "PanelStack.h"
+#include "QFontExample.h"
 #include "gettext.h"
 
 #include "support/lstrings.h"
diff --git a/src/frontends/qt4/QPrint.C b/src/frontends/qt4/QPrint.C
index e9706cabed..47350a9fae 100644
--- a/src/frontends/qt4/QPrint.C
+++ b/src/frontends/qt4/QPrint.C
@@ -1,5 +1,5 @@
 /**
- * \file QPrint.C
+ * \file QPrint.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QRef.C b/src/frontends/qt4/QRef.C
index 75229f744b..c16e6ee6f3 100644
--- a/src/frontends/qt4/QRef.C
+++ b/src/frontends/qt4/QRef.C
@@ -1,5 +1,5 @@
 /**
- * \file QRef.C
+ * \file QRef.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QSearch.C b/src/frontends/qt4/QSearch.C
index 1a0c72efe1..6bd22eefb1 100644
--- a/src/frontends/qt4/QSearch.C
+++ b/src/frontends/qt4/QSearch.C
@@ -1,5 +1,5 @@
 /**
- * \file QSearch.C
+ * \file QSearch.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QSendto.C b/src/frontends/qt4/QSendto.C
index 2ea03f603b..4efe0e32ae 100644
--- a/src/frontends/qt4/QSendto.C
+++ b/src/frontends/qt4/QSendto.C
@@ -1,5 +1,5 @@
 /**
- * \file QSendto.C
+ * \file QSendto.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QShowFile.C b/src/frontends/qt4/QShowFile.C
index 6701a48a52..5e97418a7f 100644
--- a/src/frontends/qt4/QShowFile.C
+++ b/src/frontends/qt4/QShowFile.C
@@ -1,5 +1,5 @@
 /**
- * \file QShowFile.C
+ * \file QShowFile.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QSpellchecker.C b/src/frontends/qt4/QSpellchecker.C
index 2089fb00b9..a09bc4e3a6 100644
--- a/src/frontends/qt4/QSpellchecker.C
+++ b/src/frontends/qt4/QSpellchecker.C
@@ -1,5 +1,5 @@
 /**
- * \file QSpellchecker.C
+ * \file QSpellchecker.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QTabular.C b/src/frontends/qt4/QTabular.C
index 8969ed98c3..8ea05404d6 100644
--- a/src/frontends/qt4/QTabular.C
+++ b/src/frontends/qt4/QTabular.C
@@ -1,5 +1,5 @@
 /**
- * \file QTabular.C
+ * \file QTabular.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,12 +12,12 @@
 
 #include <config.h>
 
-#include "checkedwidgets.h"
+#include "CheckedLineEdit.h"
 #include "QTabular.h"
 #include "Qt2BC.h"
 
-#include "lengthcombo.h"
-#include "validators.h"
+#include "LengthCombo.h"
+#include "Validator.h"
 #include "qt_helpers.h"
 
 #include "controllers/ButtonController.h"
@@ -31,7 +31,7 @@
 #include <QRadioButton>
 #include <QLineEdit>
 
-#include "qsetborder.h"
+#include "QSetBorder.h"
 
 using std::string;
 
diff --git a/src/frontends/qt4/QTabularCreate.C b/src/frontends/qt4/QTabularCreate.C
index ad3805747d..7baee2c760 100644
--- a/src/frontends/qt4/QTabularCreate.C
+++ b/src/frontends/qt4/QTabularCreate.C
@@ -1,5 +1,5 @@
 /**
- * \file QTabularCreate.C
+ * \file QTabularCreate.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include "QTabularCreate.h"
 #include "Qt2BC.h"
-#include "emptytable.h"
+#include "EmptyTable.h"
 
 #include "controllers/ControlTabularCreate.h"
 
diff --git a/src/frontends/qt4/QTexinfo.C b/src/frontends/qt4/QTexinfo.C
index 5529209307..96cb02b35b 100644
--- a/src/frontends/qt4/QTexinfo.C
+++ b/src/frontends/qt4/QTexinfo.C
@@ -1,5 +1,5 @@
 /**
- * \file QTexinfo.C
+ * \file QTexinfo.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QThesaurus.C b/src/frontends/qt4/QThesaurus.C
index 23de2813b3..431f608da6 100644
--- a/src/frontends/qt4/QThesaurus.C
+++ b/src/frontends/qt4/QThesaurus.C
@@ -1,5 +1,5 @@
 /**
- * \file QThesaurus.C
+ * \file QThesaurus.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QToc.C b/src/frontends/qt4/QToc.C
index ea308c0fb0..28c3d9ba76 100644
--- a/src/frontends/qt4/QToc.C
+++ b/src/frontends/qt4/QToc.C
@@ -1,5 +1,5 @@
 /**
- * \file QToc.C
+ * \file QToc.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QURLDialog.C b/src/frontends/qt4/QURLDialog.C
index 4612acdfbd..4744214e6e 100644
--- a/src/frontends/qt4/QURLDialog.C
+++ b/src/frontends/qt4/QURLDialog.C
@@ -1,5 +1,5 @@
 /**
- * \file QURLDialog.C
+ * \file QURLDialog.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QVSpace.C b/src/frontends/qt4/QVSpace.C
index ed2516ca4a..72fa302930 100644
--- a/src/frontends/qt4/QVSpace.C
+++ b/src/frontends/qt4/QVSpace.C
@@ -1,5 +1,5 @@
 /**
- * \file QVSpace.C
+ * \file QVSpace.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -18,10 +18,10 @@
 #include "QVSpace.h"
 #include "Qt2BC.h"
 
-#include "checkedwidgets.h"
-#include "lengthcombo.h"
+#include "CheckedLineEdit.h"
+#include "LengthCombo.h"
 #include "qt_helpers.h"
-#include "validators.h"
+#include "Validator.h"
 
 #include "lyxrc.h" // to set the default length values
 #include "Spacing.h"
diff --git a/src/frontends/qt4/QViewSource.C b/src/frontends/qt4/QViewSource.C
index e8c5263eda..543b063393 100644
--- a/src/frontends/qt4/QViewSource.C
+++ b/src/frontends/qt4/QViewSource.C
@@ -1,5 +1,5 @@
 /**
- * \file QViewSource.C
+ * \file QViewSource.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/QWrap.C b/src/frontends/qt4/QWrap.C
index 2a002cb746..0213a0f599 100644
--- a/src/frontends/qt4/QWrap.C
+++ b/src/frontends/qt4/QWrap.C
@@ -1,5 +1,5 @@
 /**
- * \file QWrap.C
+ * \file QWrap.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,7 +13,7 @@
 #include "QWrap.h"
 #include "Qt2BC.h"
 
-#include "lengthcombo.h"
+#include "LengthCombo.h"
 #include "qt_helpers.h"
 
 #include "controllers/ControlWrap.h"
diff --git a/src/frontends/qt4/Qt2BC.C b/src/frontends/qt4/Qt2BC.C
index 811ceecdb7..e6b42ad3c6 100644
--- a/src/frontends/qt4/Qt2BC.C
+++ b/src/frontends/qt4/Qt2BC.C
@@ -1,5 +1,5 @@
 /**
- * \file Qt2BC.C
+ * \file Qt2BC.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/TocWidget.C b/src/frontends/qt4/TocWidget.C
index b1cde0eb52..17e4c535a2 100644
--- a/src/frontends/qt4/TocWidget.C
+++ b/src/frontends/qt4/TocWidget.C
@@ -1,5 +1,5 @@
 /**
- * \file TocWidget.C
+ * \file TocWidget.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/UrlView.C b/src/frontends/qt4/UrlView.C
index 0815d72ee6..5d6dd23225 100644
--- a/src/frontends/qt4/UrlView.C
+++ b/src/frontends/qt4/UrlView.C
@@ -1,5 +1,5 @@
 /**
- * \file UrlView.C
+ * \file UrlView.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/checkedwidgets.C b/src/frontends/qt4/checkedwidgets.C
index 35fd180cbe..348bdefde1 100644
--- a/src/frontends/qt4/checkedwidgets.C
+++ b/src/frontends/qt4/checkedwidgets.C
@@ -1,5 +1,5 @@
 /**
- * \file qt4/checkedwidgets.C
+ * \file qt4/CheckedLineEdit.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "checkedwidgets.h"
+#include "CheckedLineEdit.h"
 
 #include <QLabel>
 #include <QLineEdit>
diff --git a/src/frontends/qt4/checkedwidgets.h b/src/frontends/qt4/checkedwidgets.h
index 84d50509ab..823e095265 100644
--- a/src/frontends/qt4/checkedwidgets.h
+++ b/src/frontends/qt4/checkedwidgets.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qt4/checkedwidgets.h
+ * \file qt4/CheckedLineEdit.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,8 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef CHECKEDWIDGETS_H
-#define CHECKEDWIDGETS_H
+#ifndef CHECKEDLINEEDIT_H
+#define CHECKEDLINEEDIT_H
 
 #include "BCView.h"
 
@@ -39,4 +39,4 @@ private:
 } // namespace frontend
 } // namespace lyx
 
-#endif // CHECKEDWIDGETS_H
+#endif // CHECKEDLINEEDIT_H
diff --git a/src/frontends/qt4/emptytable.C b/src/frontends/qt4/emptytable.C
index a54ebf1d16..bc233cbdca 100644
--- a/src/frontends/qt4/emptytable.C
+++ b/src/frontends/qt4/emptytable.C
@@ -1,5 +1,5 @@
 /**
- * \file emptytable.C
+ * \file EmptyTable.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "emptytable.h"
+#include "EmptyTable.h"
 
 #include <QPainter>
 #include <QMouseEvent>
@@ -113,7 +113,7 @@ void EmptyTable::mouseMoveEvent(QMouseEvent *ev)
 }
 */
 
-#include "emptytable_moc.cpp"
+#include "EmptyTable_moc.cpp"
 
 
 namespace lyx {
diff --git a/src/frontends/qt4/emptytable.h b/src/frontends/qt4/emptytable.h
index 9abe92f0df..518ea1c476 100644
--- a/src/frontends/qt4/emptytable.h
+++ b/src/frontends/qt4/emptytable.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file emptytable.h
+ * \file EmptyTable.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/iconpalette.C b/src/frontends/qt4/iconpalette.C
index b3e3666981..e99084624c 100644
--- a/src/frontends/qt4/iconpalette.C
+++ b/src/frontends/qt4/iconpalette.C
@@ -1,5 +1,5 @@
 /**
- * \file iconpalette.C
+ * \file IconPalette.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "iconpalette.h"
+#include "IconPalette.h"
 #include "qt_helpers.h"
 #include "controllers/ControlMath.h" // for find_xpm
 
@@ -182,4 +182,4 @@ void ButtonMenu::updateParent()
 } // namespace frontend
 } // namespace lyx
 
-#include "iconpalette_moc.cpp"
+#include "IconPalette_moc.cpp"
diff --git a/src/frontends/qt4/iconpalette.h b/src/frontends/qt4/iconpalette.h
index 1c2e11475a..1f0f37cd80 100644
--- a/src/frontends/qt4/iconpalette.h
+++ b/src/frontends/qt4/iconpalette.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file iconpalette.h
+ * \file IconPalette.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/lengthcombo.C b/src/frontends/qt4/lengthcombo.C
index 030c63e166..ba7de38832 100644
--- a/src/frontends/qt4/lengthcombo.C
+++ b/src/frontends/qt4/lengthcombo.C
@@ -1,5 +1,5 @@
 /**
- * \file lengthcombo.C
+ * \file LengthCombo.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "lengthcombo.h"
+#include "LengthCombo.h"
 #include "lengthcommon.h"
 #include "qt_helpers.h"
 
@@ -70,4 +70,4 @@ void LengthCombo::noPercents()
 	}
 }
 
-#include "lengthcombo_moc.cpp"
+#include "LengthCombo_moc.cpp"
diff --git a/src/frontends/qt4/lengthcombo.h b/src/frontends/qt4/lengthcombo.h
index fc9c9be41d..a0cebec003 100644
--- a/src/frontends/qt4/lengthcombo.h
+++ b/src/frontends/qt4/lengthcombo.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file lengthcombo.h
+ * \file LengthCombo.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/panelstack.C b/src/frontends/qt4/panelstack.C
index b0e5f46b18..13e3100513 100644
--- a/src/frontends/qt4/panelstack.C
+++ b/src/frontends/qt4/panelstack.C
@@ -1,5 +1,5 @@
 /**
- * \file panelstack.C
+ * \file PanelStack.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "panelstack.h"
+#include "PanelStack.h"
 
 #include "qt_helpers.h"
 
@@ -139,4 +139,4 @@ QSize PanelStack::sizeHint() const
 } // namespace frontend
 } // namespace lyx
 
-#include "panelstack_moc.cpp"
+#include "PanelStack_moc.cpp"
diff --git a/src/frontends/qt4/panelstack.h b/src/frontends/qt4/panelstack.h
index ff8948683e..1e38043b95 100644
--- a/src/frontends/qt4/panelstack.h
+++ b/src/frontends/qt4/panelstack.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file panelstack.h
+ * \file PanelStack.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/qfontexample.C b/src/frontends/qt4/qfontexample.C
index 6eb45eaa0a..7ffffbd09f 100644
--- a/src/frontends/qt4/qfontexample.C
+++ b/src/frontends/qt4/qfontexample.C
@@ -1,5 +1,5 @@
 /**
- * \file qfontexample.C
+ * \file QFontExample.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "qfontexample.h"
+#include "QFontExample.h"
 
 #include <QPainter>
 #include <QPaintEvent>
diff --git a/src/frontends/qt4/qfontexample.h b/src/frontends/qt4/qfontexample.h
index ce9bd48c53..650c6fafa6 100644
--- a/src/frontends/qt4/qfontexample.h
+++ b/src/frontends/qt4/qfontexample.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qfontexample.h
+ * \file QFontExample.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/qsetborder.C b/src/frontends/qt4/qsetborder.C
index 923a98c82e..4a96ed614f 100644
--- a/src/frontends/qt4/qsetborder.C
+++ b/src/frontends/qt4/qsetborder.C
@@ -1,5 +1,5 @@
 /**
- * \file qsetborder.C
+ * \file QSetBorder.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "qsetborder.h"
+#include "QSetBorder.h"
 
 #include <QPainter>
 
@@ -241,7 +241,7 @@ bool QSetBorder::getBottom()
 	return bottom_.set;
 }
 
-#include "qsetborder_moc.cpp"
+#include "QSetBorder_moc.cpp"
 
 
 namespace lyx {
diff --git a/src/frontends/qt4/qsetborder.h b/src/frontends/qt4/qsetborder.h
index 3309d1ae74..2c53bea6a2 100644
--- a/src/frontends/qt4/qsetborder.h
+++ b/src/frontends/qt4/qsetborder.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file qsetborder.h
+ * \file QSetBorder.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/qtTimeout.C b/src/frontends/qt4/qtTimeout.C
index 13763277bb..3b1ea51eeb 100644
--- a/src/frontends/qt4/qtTimeout.C
+++ b/src/frontends/qt4/qtTimeout.C
@@ -1,5 +1,5 @@
 /**
- * \file qtTimeout.C
+ * \file qtTimeout.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
diff --git a/src/frontends/qt4/qt_helpers.C b/src/frontends/qt4/qt_helpers.C
index c1fd07035a..24392f5bb9 100644
--- a/src/frontends/qt4/qt_helpers.C
+++ b/src/frontends/qt4/qt_helpers.C
@@ -1,5 +1,5 @@
 /**
- * \file qt_helpers.C
+ * \file qt_helpers.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "lengthcombo.h"
+#include "LengthCombo.h"
 #include "qt_helpers.h"
 
 #include "lengthcommon.h"
diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h
index 6dbad18772..9dd1a2b340 100644
--- a/src/frontends/qt4/qt_helpers.h
+++ b/src/frontends/qt4/qt_helpers.h
@@ -52,7 +52,7 @@ void lengthAutoToWidgets(QLineEdit * input, LengthCombo * combo,
 //determines what text is to be written for "auto". But making
 //that work involves more extensive revisions than we now want
 //to make, since "auto" also appears in update_contents() (see
-//QGraphics.C). 
+//QGraphics.cpp). 
 //The right way to do this, I think, would be to define a class
 //checkedLengthSet (and a partnering labeledLengthSete) that encapsulated 
 //the checkbox, line edit, and length combo together, and then made e.g.
diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui
index e7ac1f2613..5e6c4c21e8 100644
--- a/src/frontends/qt4/ui/BoxUi.ui
+++ b/src/frontends/qt4/ui/BoxUi.ui
@@ -370,7 +370,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends>QComboBox</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/DocumentUi.ui b/src/frontends/qt4/ui/DocumentUi.ui
index edce19db6e..5fc980d2b5 100644
--- a/src/frontends/qt4/ui/DocumentUi.ui
+++ b/src/frontends/qt4/ui/DocumentUi.ui
@@ -168,7 +168,7 @@
   <customwidget>
    <class>lyx::frontend::PanelStack</class>
    <extends></extends>
-   <header>panelstack.h</header>
+   <header>PanelStack.h</header>
    <container>1</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/ExternalUi.ui b/src/frontends/qt4/ui/ExternalUi.ui
index d98edef7f3..bdea5d5107 100644
--- a/src/frontends/qt4/ui/ExternalUi.ui
+++ b/src/frontends/qt4/ui/ExternalUi.ui
@@ -722,7 +722,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends>QWidget</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui
index 6fd3094c3c..38beafd67b 100644
--- a/src/frontends/qt4/ui/GraphicsUi.ui
+++ b/src/frontends/qt4/ui/GraphicsUi.ui
@@ -756,7 +756,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends>QComboBox</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/frontends/qt4/ui/MarginsUi.ui b/src/frontends/qt4/ui/MarginsUi.ui
index 4b93f355c4..7d822fb628 100644
--- a/src/frontends/qt4/ui/MarginsUi.ui
+++ b/src/frontends/qt4/ui/MarginsUi.ui
@@ -362,7 +362,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends>QWidget</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/frontends/qt4/ui/MathMatrixUi.ui b/src/frontends/qt4/ui/MathMatrixUi.ui
index a524aae29c..89e525ac6e 100644
--- a/src/frontends/qt4/ui/MathMatrixUi.ui
+++ b/src/frontends/qt4/ui/MathMatrixUi.ui
@@ -281,7 +281,7 @@
   <customwidget>
    <class>EmptyTable</class>
    <extends>QWidget</extends>
-   <header>emptytable.h</header>
+   <header>EmptyTable.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/PageLayoutUi.ui b/src/frontends/qt4/ui/PageLayoutUi.ui
index 10fb8fa3a2..f574d63442 100644
--- a/src/frontends/qt4/ui/PageLayoutUi.ui
+++ b/src/frontends/qt4/ui/PageLayoutUi.ui
@@ -225,7 +225,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends></extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/PrefScreenFontsUi.ui b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
index 88975764b6..6a83d7c86c 100644
--- a/src/frontends/qt4/ui/PrefScreenFontsUi.ui
+++ b/src/frontends/qt4/ui/PrefScreenFontsUi.ui
@@ -382,7 +382,7 @@
   <customwidget>
    <class>QFontExample</class>
    <extends>QWidget</extends>
-   <header>qfontexample.h</header>
+   <header>QFontExample.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/PrefsUi.ui b/src/frontends/qt4/ui/PrefsUi.ui
index 14cb86a28d..c50cc61bd9 100644
--- a/src/frontends/qt4/ui/PrefsUi.ui
+++ b/src/frontends/qt4/ui/PrefsUi.ui
@@ -112,7 +112,7 @@
   <customwidget>
    <class>lyx::frontend::PanelStack</class>
    <extends></extends>
-   <header>panelstack.h</header>
+   <header>PanelStack.h</header>
    <container>1</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui
index b07c8fd4fa..2bcd92980c 100644
--- a/src/frontends/qt4/ui/TabularUi.ui
+++ b/src/frontends/qt4/ui/TabularUi.ui
@@ -1147,14 +1147,14 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends>QComboBox</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
   <customwidget>
    <class>QSetBorder</class>
    <extends>QWidget</extends>
-   <header>qsetborder.h</header>
+   <header>QSetBorder.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui
index a333cc0f02..cf3af16043 100644
--- a/src/frontends/qt4/ui/TextLayoutUi.ui
+++ b/src/frontends/qt4/ui/TextLayoutUi.ui
@@ -194,7 +194,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends>QWidget</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/ui/VSpaceUi.ui b/src/frontends/qt4/ui/VSpaceUi.ui
index b02a564ff0..ddea6c863e 100644
--- a/src/frontends/qt4/ui/VSpaceUi.ui
+++ b/src/frontends/qt4/ui/VSpaceUi.ui
@@ -212,7 +212,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends>QWidget</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/frontends/qt4/ui/WrapUi.ui b/src/frontends/qt4/ui/WrapUi.ui
index 4e9cf8d76f..1dc89b7ff0 100644
--- a/src/frontends/qt4/ui/WrapUi.ui
+++ b/src/frontends/qt4/ui/WrapUi.ui
@@ -232,7 +232,7 @@
   <customwidget>
    <class>LengthCombo</class>
    <extends></extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
diff --git a/src/frontends/qt4/validators.C b/src/frontends/qt4/validators.C
index e4cf2fe68e..262574d5b4 100644
--- a/src/frontends/qt4/validators.C
+++ b/src/frontends/qt4/validators.C
@@ -1,5 +1,5 @@
 /**
- * \file validators.C
+ * \file Validator.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "validators.h"
+#include "Validator.h"
 #include "qt_helpers.h"
 
 #include "gettext.h"
@@ -209,5 +209,5 @@ PathValidator * getPathValidator(QLineEdit * ed)
 
 } // namespace lyx
 
-#include "validators_moc.cpp"
+#include "Validator_moc.cpp"
 
diff --git a/src/frontends/qt4/validators.h b/src/frontends/qt4/validators.h
index e003f1500d..686dd06fec 100644
--- a/src/frontends/qt4/validators.h
+++ b/src/frontends/qt4/validators.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file validators.h
+ * \file Validator.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -22,8 +22,8 @@
  * further details.
  */
 
-#ifndef VALIDATORS_H
-#define VALIDATORS_H
+#ifndef VALIDATOR_H
+#define VALIDATOR_H
 
 #include "lyxlength.h"
 #include "lyxgluelength.h"
@@ -165,4 +165,4 @@ PathValidator * getPathValidator(QLineEdit *);
 
 } // namespace lyx
 
-# endif // NOT VALIDATORS_H
+# endif // NOT VALIDATOR_H
-- 
2.39.5