From: André Pönitz <poenitz@gmx.net>
Date: Fri, 14 Nov 2008 14:28:50 +0000 (+0000)
Subject: thrid attempt at changing the naming pattern of the intermediated 'mocced' files
X-Git-Tag: 2.0.0~7802
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1fc477efac5fd3804c6407a03791e713f643fc43;p=features.git

thrid attempt at changing the naming pattern of the intermediated 'mocced' files


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27420 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp
index 724d9daf8b..4c13e636ca 100644
--- a/src/frontends/qt4/Action.cpp
+++ b/src/frontends/qt4/Action.cpp
@@ -73,4 +73,4 @@ void Action::action()
 } // namespace frontend
 } // namespace lyx
 
-#include "Action_moc.cpp"
+#include "moc_Action.cpp"
diff --git a/src/frontends/qt4/BulletsModule.cpp b/src/frontends/qt4/BulletsModule.cpp
index 438fa0475a..03b89a83a1 100644
--- a/src/frontends/qt4/BulletsModule.cpp
+++ b/src/frontends/qt4/BulletsModule.cpp
@@ -195,4 +195,4 @@ Bullet const & BulletsModule::bullet(int level) const
 } // namespace lyx
 
 
-#include "BulletsModule_moc.cpp"
+#include "moc_BulletsModule.cpp"
diff --git a/src/frontends/qt4/CustomizedWidgets.cpp b/src/frontends/qt4/CustomizedWidgets.cpp
index a3a61bf8b9..e50ef98e6e 100644
--- a/src/frontends/qt4/CustomizedWidgets.cpp
+++ b/src/frontends/qt4/CustomizedWidgets.cpp
@@ -157,4 +157,4 @@ void ShortcutWidget::removeFromSequence()
 } // namespace frontend
 } // namespace lyx
 
-#include "CustomizedWidgets_moc.cpp"
+#include "moc_CustomizedWidgets.cpp"
diff --git a/src/frontends/qt4/EmptyTable.cpp b/src/frontends/qt4/EmptyTable.cpp
index 6c354fcc36..d95d7a2443 100644
--- a/src/frontends/qt4/EmptyTable.cpp
+++ b/src/frontends/qt4/EmptyTable.cpp
@@ -113,7 +113,7 @@ void EmptyTable::mouseMoveEvent(QMouseEvent *ev)
 }
 */
 
-#include "EmptyTable_moc.cpp"
+#include "moc_EmptyTable.cpp"
 
 
 namespace lyx {
diff --git a/src/frontends/qt4/FloatPlacement.cpp b/src/frontends/qt4/FloatPlacement.cpp
index f49bc5c8d1..22fc1ac1d7 100644
--- a/src/frontends/qt4/FloatPlacement.cpp
+++ b/src/frontends/qt4/FloatPlacement.cpp
@@ -241,4 +241,4 @@ void FloatPlacement::checkAllowed()
 
 } // namespace lyx
 
-#include "FloatPlacement_moc.cpp"
+#include "moc_FloatPlacement.cpp"
diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp
index 4514fc7fb4..4925a3f436 100644
--- a/src/frontends/qt4/GuiAbout.cpp
+++ b/src/frontends/qt4/GuiAbout.cpp
@@ -119,4 +119,4 @@ Dialog * createGuiAbout(GuiView & lv) { return new GuiAbout(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiAbout_moc.cpp"
+#include "moc_GuiAbout.cpp"
diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index e399835a7b..5c128bc7d1 100644
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -171,6 +171,9 @@ void warning(docstring const & title0, docstring const & message)
 }
 
 
+int argc = 1;
+char * argv[1];
+
 void error(docstring const & title0, docstring const & message)
 {
 	lyxerr << "Error: " << title0 << '\n'
@@ -182,8 +185,6 @@ void error(docstring const & title0, docstring const & message)
 
 	docstring const title = bformat(_("LyX: %1$s"), title0);
 	if (theApp() == 0) {
-		int argc = 1;
-		char * argv[1];
 		QApplication app(argc, argv);
 		QMessageBox::critical(0,
 			toqstr(title),
diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index d4b7bce11f..89fce62a1e 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1611,4 +1611,4 @@ frontend::Selection & theSelection()
 
 } // namespace lyx
 
-#include "GuiApplication_moc.cpp"
+#include "moc_GuiApplication.cpp"
diff --git a/src/frontends/qt4/GuiBibitem.cpp b/src/frontends/qt4/GuiBibitem.cpp
index a74a34cb65..20285f8daa 100644
--- a/src/frontends/qt4/GuiBibitem.cpp
+++ b/src/frontends/qt4/GuiBibitem.cpp
@@ -94,4 +94,4 @@ Dialog * createGuiBibitem(GuiView & lv) { return new GuiBibitem(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiBibitem_moc.cpp"
+#include "moc_GuiBibitem.cpp"
diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 3b78e406a7..8c187e3f1b 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -555,4 +555,4 @@ Dialog * createGuiBibtex(GuiView & lv) { return new GuiBibtex(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiBibtex_moc.cpp"
+#include "moc_GuiBibtex.cpp"
diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 744cbd2a3e..695c1bbe33 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -489,4 +489,4 @@ Dialog * createGuiBox(GuiView & lv) { return new GuiBox(lv); }
 } // namespace lyx
 
 
-#include "GuiBox_moc.cpp"
+#include "moc_GuiBox.cpp"
diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp
index 524208340a..a8961da91d 100644
--- a/src/frontends/qt4/GuiBranch.cpp
+++ b/src/frontends/qt4/GuiBranch.cpp
@@ -107,4 +107,4 @@ Dialog * createGuiBranch(GuiView & lv) { return new GuiBranch(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiBranch_moc.cpp"
+#include "moc_GuiBranch.cpp"
diff --git a/src/frontends/qt4/GuiBranches.cpp b/src/frontends/qt4/GuiBranches.cpp
index a004218562..233601caf3 100644
--- a/src/frontends/qt4/GuiBranches.cpp
+++ b/src/frontends/qt4/GuiBranches.cpp
@@ -186,4 +186,4 @@ void GuiBranches::toggleColor(QTreeWidgetItem * item)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiBranches_moc.cpp"
+#include "moc_GuiBranches.cpp"
diff --git a/src/frontends/qt4/GuiChanges.cpp b/src/frontends/qt4/GuiChanges.cpp
index 5405e5d603..6507137f83 100644
--- a/src/frontends/qt4/GuiChanges.cpp
+++ b/src/frontends/qt4/GuiChanges.cpp
@@ -122,4 +122,4 @@ Dialog * createGuiChanges(GuiView & lv) { return new GuiChanges(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiChanges_moc.cpp"
+#include "moc_GuiChanges.cpp"
diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index f2885b1fc1..08fedef4ba 100644
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -405,4 +405,4 @@ Dialog * createGuiCharacter(GuiView & lv) { return new GuiCharacter(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCharacter_moc.cpp"
+#include "moc_GuiCharacter.cpp"
diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index ac0d92ace8..57e7cc6e98 100644
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -765,5 +765,5 @@ Dialog * createGuiCitation(GuiView & lv) { return new GuiCitation(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCitation_moc.cpp"
+#include "moc_GuiCitation.cpp"
 
diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp
index dcef9a4b26..d801e06928 100644
--- a/src/frontends/qt4/GuiClipboard.cpp
+++ b/src/frontends/qt4/GuiClipboard.cpp
@@ -441,4 +441,4 @@ bool GuiClipboard::empty() const
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiClipboard_moc.cpp"
+#include "moc_GuiClipboard.cpp"
diff --git a/src/frontends/qt4/GuiCommandBuffer.cpp b/src/frontends/qt4/GuiCommandBuffer.cpp
index 6958e45469..3fa41194fa 100644
--- a/src/frontends/qt4/GuiCommandBuffer.cpp
+++ b/src/frontends/qt4/GuiCommandBuffer.cpp
@@ -327,4 +327,4 @@ void GuiCommandBuffer::dispatch(string const & str)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCommandBuffer_moc.cpp"
+#include "moc_GuiCommandBuffer.cpp"
diff --git a/src/frontends/qt4/GuiCommandEdit.cpp b/src/frontends/qt4/GuiCommandEdit.cpp
index f952a2a3a5..6dbec414a0 100644
--- a/src/frontends/qt4/GuiCommandEdit.cpp
+++ b/src/frontends/qt4/GuiCommandEdit.cpp
@@ -78,4 +78,4 @@ bool GuiCommandEdit::event(QEvent * e)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCommandEdit_moc.cpp"
+#include "moc_GuiCommandEdit.cpp"
diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index 0e81aa0344..2eb5f18e35 100644
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -880,4 +880,4 @@ void GuiCompleter::popupHighlighted(const QString & completion)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCompleter_moc.cpp"
+#include "moc_GuiCompleter.cpp"
diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp
index 2ff733554f..af4e609e2d 100644
--- a/src/frontends/qt4/GuiDelimiter.cpp
+++ b/src/frontends/qt4/GuiDelimiter.cpp
@@ -341,4 +341,4 @@ Dialog * createGuiDelimiter(GuiView & lv) { return new GuiDelimiter(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiDelimiter_moc.cpp"
+#include "moc_GuiDelimiter.cpp"
diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index f7271ad2bd..3e8a54faca 100644
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -113,4 +113,4 @@ void GuiDialog::updateView()
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiDialog_moc.cpp"
+#include "moc_GuiDialog.cpp"
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index a482aebee8..8d9a37c574 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -2487,4 +2487,4 @@ Dialog * createGuiDocument(GuiView & lv) { return new GuiDocument(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiDocument_moc.cpp"
+#include "moc_GuiDocument.cpp"
diff --git a/src/frontends/qt4/GuiERT.cpp b/src/frontends/qt4/GuiERT.cpp
index da1c0037d0..db846fff00 100644
--- a/src/frontends/qt4/GuiERT.cpp
+++ b/src/frontends/qt4/GuiERT.cpp
@@ -90,4 +90,4 @@ Dialog * createGuiERT(GuiView & lv) { return new GuiERT(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiERT_moc.cpp"
+#include "moc_GuiERT.cpp"
diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index 54eb83ebc6..bcab846423 100644
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -135,4 +135,4 @@ Dialog * createGuiErrorList(GuiView & lv) { return new GuiErrorList(lv); }
 } // namespace lyx
 
 
-#include "GuiErrorList_moc.cpp"
+#include "moc_GuiErrorList.cpp"
diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp
index df0ce70f4f..a32a33c3a5 100644
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -671,4 +671,4 @@ Dialog * createGuiExternal(GuiView & lv) { return new GuiExternal(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiExternal_moc.cpp"
+#include "moc_GuiExternal.cpp"
diff --git a/src/frontends/qt4/GuiFloat.cpp b/src/frontends/qt4/GuiFloat.cpp
index 9fedf75f88..773a7f0ba8 100644
--- a/src/frontends/qt4/GuiFloat.cpp
+++ b/src/frontends/qt4/GuiFloat.cpp
@@ -95,4 +95,4 @@ Dialog * createGuiFloat(GuiView & lv) { return new GuiFloat(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiFloat_moc.cpp"
+#include "moc_GuiFloat.cpp"
diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index 2b6bf01908..e6fb9025f4 100644
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -780,4 +780,4 @@ Dialog * createGuiGraphics(GuiView & lv) { return new GuiGraphics(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiGraphics_moc.cpp"
+#include "moc_GuiGraphics.cpp"
diff --git a/src/frontends/qt4/GuiHSpace.cpp b/src/frontends/qt4/GuiHSpace.cpp
index 60a279e9f9..5b8c37fcf1 100644
--- a/src/frontends/qt4/GuiHSpace.cpp
+++ b/src/frontends/qt4/GuiHSpace.cpp
@@ -310,4 +310,4 @@ Dialog * createGuiHSpace(GuiView & lv) { return new GuiHSpace(lv); }
 } // namespace lyx
 
 
-#include "GuiHSpace_moc.cpp"
+#include "moc_GuiHSpace.cpp"
diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp
index 07fe2c095a..76181651f8 100644
--- a/src/frontends/qt4/GuiHyperlink.cpp
+++ b/src/frontends/qt4/GuiHyperlink.cpp
@@ -120,4 +120,4 @@ Dialog * createGuiHyperlink(GuiView & lv) { return new GuiHyperlink(lv); }
 } // namespace lyx
 
 
-#include "GuiHyperlink_moc.cpp"
+#include "moc_GuiHyperlink.cpp"
diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 07a1fb8f9f..989509878a 100644
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -347,4 +347,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"
diff --git a/src/frontends/qt4/GuiInfo.cpp b/src/frontends/qt4/GuiInfo.cpp
index 352a36164c..929360efaf 100644
--- a/src/frontends/qt4/GuiInfo.cpp
+++ b/src/frontends/qt4/GuiInfo.cpp
@@ -159,4 +159,4 @@ Dialog * createGuiInfo(GuiView & lv) { return new GuiInfo(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInfo_moc.cpp"
+#include "moc_GuiInfo.cpp"
diff --git a/src/frontends/qt4/GuiLabel.cpp b/src/frontends/qt4/GuiLabel.cpp
index 47564a1f05..8a4a7c26fa 100644
--- a/src/frontends/qt4/GuiLabel.cpp
+++ b/src/frontends/qt4/GuiLabel.cpp
@@ -105,4 +105,4 @@ Dialog * createGuiLabel(GuiView & lv) { return new GuiLabel(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiLabel_moc.cpp"
+#include "moc_GuiLabel.cpp"
diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 7ce3c39888..5601bbdc9a 100644
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -647,4 +647,4 @@ Dialog * createGuiListings(GuiView & lv) { return new GuiListings(lv); }
 } // namespace lyx
 
 
-#include "GuiListings_moc.cpp"
+#include "moc_GuiListings.cpp"
diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index d59d30a48d..2ddadc9226 100644
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -236,4 +236,4 @@ Dialog * createGuiLog(GuiView & lv) { return new GuiLog(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiLog_moc.cpp"
+#include "moc_GuiLog.cpp"
diff --git a/src/frontends/qt4/GuiMathMatrix.cpp b/src/frontends/qt4/GuiMathMatrix.cpp
index 24722b00e8..13c640ce04 100644
--- a/src/frontends/qt4/GuiMathMatrix.cpp
+++ b/src/frontends/qt4/GuiMathMatrix.cpp
@@ -109,4 +109,4 @@ Dialog * createGuiMathMatrix(GuiView & lv) { return new GuiMathMatrix(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiMathMatrix_moc.cpp"
+#include "moc_GuiMathMatrix.cpp"
diff --git a/src/frontends/qt4/GuiNomencl.cpp b/src/frontends/qt4/GuiNomencl.cpp
index fb999eb8ad..8eb5b248b6 100644
--- a/src/frontends/qt4/GuiNomencl.cpp
+++ b/src/frontends/qt4/GuiNomencl.cpp
@@ -118,4 +118,4 @@ Dialog * createGuiNomenclature(GuiView & lv)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiNomencl_moc.cpp"
+#include "moc_GuiNomencl.cpp"
diff --git a/src/frontends/qt4/GuiNote.cpp b/src/frontends/qt4/GuiNote.cpp
index 038b053623..1f6e46d0bf 100644
--- a/src/frontends/qt4/GuiNote.cpp
+++ b/src/frontends/qt4/GuiNote.cpp
@@ -98,4 +98,4 @@ Dialog * createGuiNote(GuiView & lv) { return new GuiNote(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiNote_moc.cpp"
+#include "moc_GuiNote.cpp"
diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp
index 9fa34c6c2f..183b1fe1cc 100644
--- a/src/frontends/qt4/GuiParagraph.cpp
+++ b/src/frontends/qt4/GuiParagraph.cpp
@@ -380,4 +380,4 @@ Dialog * createGuiParagraph(GuiView & lv)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiParagraph_moc.cpp"
+#include "moc_GuiParagraph.cpp"
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index ca04de85cd..7b9f8b1422 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2786,4 +2786,4 @@ Dialog * createGuiPreferences(GuiView & lv) { return new GuiPreferences(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiPrefs_moc.cpp"
+#include "moc_GuiPrefs.cpp"
diff --git a/src/frontends/qt4/GuiPrint.cpp b/src/frontends/qt4/GuiPrint.cpp
index 14339be16b..9bf42817b1 100644
--- a/src/frontends/qt4/GuiPrint.cpp
+++ b/src/frontends/qt4/GuiPrint.cpp
@@ -252,4 +252,4 @@ Dialog * createGuiPrint(GuiView & lv) { return new GuiPrint(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiPrint_moc.cpp"
+#include "moc_GuiPrint.cpp"
diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index 4c0ef3e503..d079c2acfb 100644
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -413,4 +413,4 @@ Dialog * createGuiRef(GuiView & lv) { return new GuiRef(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiRef_moc.cpp"
+#include "moc_GuiRef.cpp"
diff --git a/src/frontends/qt4/GuiSearch.cpp b/src/frontends/qt4/GuiSearch.cpp
index 97f821dd6f..7a095d5ec2 100644
--- a/src/frontends/qt4/GuiSearch.cpp
+++ b/src/frontends/qt4/GuiSearch.cpp
@@ -141,4 +141,4 @@ Dialog * createGuiSearch(GuiView & lv) { return new GuiSearch(lv); }
 } // namespace lyx
 
 
-#include "GuiSearch_moc.cpp"
+#include "moc_GuiSearch.cpp"
diff --git a/src/frontends/qt4/GuiSelection.cpp b/src/frontends/qt4/GuiSelection.cpp
index c3e53a542e..362da4aba5 100644
--- a/src/frontends/qt4/GuiSelection.cpp
+++ b/src/frontends/qt4/GuiSelection.cpp
@@ -113,4 +113,4 @@ bool GuiSelection::empty() const
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiSelection_moc.cpp"
+#include "moc_GuiSelection.cpp"
diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp
index 7fe8c8c88c..dda0458868 100644
--- a/src/frontends/qt4/GuiSelectionManager.cpp
+++ b/src/frontends/qt4/GuiSelectionManager.cpp
@@ -369,4 +369,4 @@ bool GuiSelectionManager::eventFilter(QObject * obj, QEvent * event)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiSelectionManager_moc.cpp"
+#include "moc_GuiSelectionManager.cpp"
diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp
index 5e29f9b266..288652a4ee 100644
--- a/src/frontends/qt4/GuiSendto.cpp
+++ b/src/frontends/qt4/GuiSendto.cpp
@@ -220,4 +220,4 @@ Dialog * createGuiSendTo(GuiView & lv) { return new GuiSendTo(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiSendto_moc.cpp"
+#include "moc_GuiSendto.cpp"
diff --git a/src/frontends/qt4/GuiSetBorder.cpp b/src/frontends/qt4/GuiSetBorder.cpp
index adc1162d3a..dd13288e06 100644
--- a/src/frontends/qt4/GuiSetBorder.cpp
+++ b/src/frontends/qt4/GuiSetBorder.cpp
@@ -239,4 +239,4 @@ bool GuiSetBorder::getBottom()
 	return bottom_.set;
 }
 
-#include "GuiSetBorder_moc.cpp"
+#include "moc_GuiSetBorder.cpp"
diff --git a/src/frontends/qt4/GuiShowFile.cpp b/src/frontends/qt4/GuiShowFile.cpp
index 43d519610a..c2a4360b2f 100644
--- a/src/frontends/qt4/GuiShowFile.cpp
+++ b/src/frontends/qt4/GuiShowFile.cpp
@@ -69,4 +69,4 @@ Dialog * createGuiShowFile(GuiView & lv) { return new GuiShowFile(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiShowFile_moc.cpp"
+#include "moc_GuiShowFile.cpp"
diff --git a/src/frontends/qt4/GuiSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp
index 4440262060..acf81cdcea 100644
--- a/src/frontends/qt4/GuiSpellchecker.cpp
+++ b/src/frontends/qt4/GuiSpellchecker.cpp
@@ -477,4 +477,4 @@ Dialog * createGuiSpellchecker(GuiView & lv) { return new GuiSpellchecker(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiSpellchecker_moc.cpp"
+#include "moc_GuiSpellchecker.cpp"
diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp
index 864b7b49c4..917da95a9b 100644
--- a/src/frontends/qt4/GuiSymbols.cpp
+++ b/src/frontends/qt4/GuiSymbols.cpp
@@ -477,4 +477,4 @@ Dialog * createGuiSymbols(GuiView & lv)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiSymbols_moc.cpp"
+#include "moc_GuiSymbols.cpp"
diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index d7217a5223..8ec0cd31f5 100644
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -1130,4 +1130,4 @@ Dialog * createGuiTabular(GuiView & lv) { return new GuiTabular(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiTabular_moc.cpp"
+#include "moc_GuiTabular.cpp"
diff --git a/src/frontends/qt4/GuiTabularCreate.cpp b/src/frontends/qt4/GuiTabularCreate.cpp
index 33e20f33e5..12641443a2 100644
--- a/src/frontends/qt4/GuiTabularCreate.cpp
+++ b/src/frontends/qt4/GuiTabularCreate.cpp
@@ -97,4 +97,4 @@ Dialog * createGuiTabularCreate(GuiView & lv)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiTabularCreate_moc.cpp"
+#include "moc_GuiTabularCreate.cpp"
diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp
index 9d3c033a80..cc901c9c28 100644
--- a/src/frontends/qt4/GuiTexinfo.cpp
+++ b/src/frontends/qt4/GuiTexinfo.cpp
@@ -192,4 +192,4 @@ Dialog * createGuiTexInfo(GuiView & lv) { return new GuiTexInfo(lv); }
 } // namespace lyx
 
 
-#include "GuiTexinfo_moc.cpp"
+#include "moc_GuiTexinfo.cpp"
diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp
index bd3e179472..183e102174 100644
--- a/src/frontends/qt4/GuiThesaurus.cpp
+++ b/src/frontends/qt4/GuiThesaurus.cpp
@@ -185,4 +185,4 @@ Dialog * createGuiThesaurus(GuiView & lv) { return new GuiThesaurus(lv); }
 } // namespace lyx
 
 
-#include "GuiThesaurus_moc.cpp"
+#include "moc_GuiThesaurus.cpp"
diff --git a/src/frontends/qt4/GuiToc.cpp b/src/frontends/qt4/GuiToc.cpp
index 507d0d0543..f01d9945dc 100644
--- a/src/frontends/qt4/GuiToc.cpp
+++ b/src/frontends/qt4/GuiToc.cpp
@@ -107,4 +107,4 @@ Dialog * createGuiToc(GuiView & lv)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiToc_moc.cpp"
+#include "moc_GuiToc.cpp"
diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 735f39c228..15b4a02314 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -971,4 +971,4 @@ void GuiToolbar::toggle()
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiToolbar_moc.cpp"
+#include "moc_GuiToolbar.cpp"
diff --git a/src/frontends/qt4/GuiVSpace.cpp b/src/frontends/qt4/GuiVSpace.cpp
index e5abcd2117..ec4ae3cf7d 100644
--- a/src/frontends/qt4/GuiVSpace.cpp
+++ b/src/frontends/qt4/GuiVSpace.cpp
@@ -194,4 +194,4 @@ Dialog * createGuiVSpace(GuiView & lv) { return new GuiVSpace(lv); }
 } // namespace lyx
 
 
-#include "GuiVSpace_moc.cpp"
+#include "moc_GuiVSpace.cpp"
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index d615149dbf..770c333cc8 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2509,4 +2509,4 @@ Dialog * GuiView::build(string const & name)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiView_moc.cpp"
+#include "moc_GuiView.cpp"
diff --git a/src/frontends/qt4/GuiViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp
index ae5d9ff4b9..5941186b98 100644
--- a/src/frontends/qt4/GuiViewSource.cpp
+++ b/src/frontends/qt4/GuiViewSource.cpp
@@ -240,4 +240,4 @@ Dialog * createGuiViewSource(GuiView & lv)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiViewSource_moc.cpp"
+#include "moc_GuiViewSource.cpp"
diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index dfcdaa5344..dd4d4d8243 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -1735,4 +1735,4 @@ void DragTabBar::dropEvent(QDropEvent * event)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiWorkArea_moc.cpp"
+#include "moc_GuiWorkArea.cpp"
diff --git a/src/frontends/qt4/GuiWrap.cpp b/src/frontends/qt4/GuiWrap.cpp
index ebc78bbacf..75b1334a66 100644
--- a/src/frontends/qt4/GuiWrap.cpp
+++ b/src/frontends/qt4/GuiWrap.cpp
@@ -215,4 +215,4 @@ Dialog * createGuiWrap(GuiView & lv) { return new GuiWrap(lv); }
 } // namespace lyx
 
 
-#include "GuiWrap_moc.cpp"
+#include "moc_GuiWrap.cpp"
diff --git a/src/frontends/qt4/IconPalette.cpp b/src/frontends/qt4/IconPalette.cpp
index af4d9db098..aaa8dac0b6 100644
--- a/src/frontends/qt4/IconPalette.cpp
+++ b/src/frontends/qt4/IconPalette.cpp
@@ -266,4 +266,4 @@ void ButtonMenu::updateParent()
 } // namespace frontend
 } // namespace lyx
 
-#include "IconPalette_moc.cpp"
+#include "moc_IconPalette.cpp"
diff --git a/src/frontends/qt4/InsertTableWidget.cpp b/src/frontends/qt4/InsertTableWidget.cpp
index 4ff38099ed..76b852356f 100644
--- a/src/frontends/qt4/InsertTableWidget.cpp
+++ b/src/frontends/qt4/InsertTableWidget.cpp
@@ -156,4 +156,4 @@ void InsertTableWidget::updateParent()
 } // namespace frontend
 } // namespace lyx
 
-#include "InsertTableWidget_moc.cpp"
+#include "moc_InsertTableWidget.cpp"
diff --git a/src/frontends/qt4/LengthCombo.cpp b/src/frontends/qt4/LengthCombo.cpp
index 9b1db41b46..0ddd1fcc13 100644
--- a/src/frontends/qt4/LengthCombo.cpp
+++ b/src/frontends/qt4/LengthCombo.cpp
@@ -70,4 +70,4 @@ void LengthCombo::noPercents()
 	}
 }
 
-#include "LengthCombo_moc.cpp"
+#include "moc_LengthCombo.cpp"
diff --git a/src/frontends/qt4/LyXFileDialog.cpp b/src/frontends/qt4/LyXFileDialog.cpp
index 0df10992e2..b9a9045cc2 100644
--- a/src/frontends/qt4/LyXFileDialog.cpp
+++ b/src/frontends/qt4/LyXFileDialog.cpp
@@ -91,4 +91,4 @@ void LyXFileDialog::button2Clicked()
 
 } // namespace lyx
 
-#include "LyXFileDialog_moc.cpp"
+#include "moc_LyXFileDialog.cpp"
diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5b1919c10a..4c8f2c2f22 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -13,9 +13,9 @@ UIC4FLAGS=-tr lyx::qt_
 ui_%.h: ui/%.ui
 	$(UIC4) $(UIC4FLAGS) $< -o $@
 
-MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
-%_moc.cpp: %.h
+moc_%.cpp: %.h
 	$(MOC4) -o $@ $<
 
 Resources.qrc: Makefile
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index f8fcc96382..43e339401d 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1645,4 +1645,4 @@ Menu * Menus::menu(QString const & name, GuiView & view)
 } // namespace frontend
 } // namespace lyx
 
-#include "Menus_moc.cpp"
+#include "moc_Menus.cpp"
diff --git a/src/frontends/qt4/PanelStack.cpp b/src/frontends/qt4/PanelStack.cpp
index d85c93c38c..0c65cfea12 100644
--- a/src/frontends/qt4/PanelStack.cpp
+++ b/src/frontends/qt4/PanelStack.cpp
@@ -144,4 +144,4 @@ QSize PanelStack::sizeHint() const
 } // namespace frontend
 } // namespace lyx
 
-#include "PanelStack_moc.cpp"
+#include "moc_PanelStack.cpp"
diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index c43a98be54..1301e8d174 100644
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -374,4 +374,4 @@ void TocModels::sort(QString const & type, bool sort_it)
 } // namespace frontend
 } // namespace lyx
 
-#include "TocModel_moc.cpp"
+#include "moc_TocModel.cpp"
diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index 96636fe91a..034e0b1e23 100644
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -337,4 +337,4 @@ void TocWidget::init(QString const & str)
 } // namespace frontend
 } // namespace lyx
 
-#include "TocWidget_moc.cpp"
+#include "moc_TocWidget.cpp"
diff --git a/src/frontends/qt4/Validator.cpp b/src/frontends/qt4/Validator.cpp
index f376afbe2a..51103d957d 100644
--- a/src/frontends/qt4/Validator.cpp
+++ b/src/frontends/qt4/Validator.cpp
@@ -203,4 +203,4 @@ PathValidator * getPathValidator(QLineEdit * ed)
 } // namespace frontend
 } // namespace lyx
 
-#include "Validator_moc.cpp"
+#include "moc_Validator.cpp"
diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp
index b38f2619cc..14c7696fb4 100644
--- a/src/mathed/InsetFormulaMacro.cpp
+++ b/src/mathed/InsetFormulaMacro.cpp
@@ -36,7 +36,7 @@ namespace lyx {
 
 
 InsetFormulaMacro::InsetFormulaMacro()
-	: InsetMathNest(2), name_("unknownA")
+	: InsetMathNest(2), name_(from_ascii("unknownA"))
 {}
 
 
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 1b5f7086e0..659eaa03f5 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -17,12 +17,12 @@ BUILT_SOURCES = $(PCH_FILE)
 
 MOCHEADER = SignalSlotPrivate.h
 
-MOCEDFILES = $(MOCHEADER:%.h=%_moc.cpp)
+MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
 
 CLEANFILES += $(MOCEDFILES)
 BUILT_SOURCES += $(MOCEDFILES)
 
-%_moc.cpp: %.h
+moc_%.cpp: %.h
 	$(MOC4) -o $@ $<
 
 liblyxsupport_la_DEPENDENCIES = $(MOCEDFILES)
diff --git a/src/support/SignalSlotPrivate.cpp b/src/support/SignalSlotPrivate.cpp
index ea3217fd6b..10dd6d19ef 100644
--- a/src/support/SignalSlotPrivate.cpp
+++ b/src/support/SignalSlotPrivate.cpp
@@ -12,5 +12,6 @@
 #include <config.h>
 
 // trigger moc 
-#include "SignalSlotPrivate_moc.cpp"
+#include "SignalSlotPrivate.h"
+#include "moc_SignalSlotPrivate.cpp"