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 724d9daf8ba2ba658a7bd09f69e1fda69dd1d6ef..4c13e636ca22dbf8a31f7da1c6f47e97f39e5b76 100644 (file)
--- 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 438fa0475a1e3a0c4570cdc05b4592687c774779..03b89a83a1ca22717fe91cfdcdac150bc578da21 100644 (file)
--- 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 a3a61bf8b9bc0d8341f0ffe41c485f3b0c071cfc..e50ef98e6e35a54cbcb21899abcd3ce971428851 100644 (file)
--- 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 6c354fcc362cb11ced62d5d4dadf4911451aa533..d95d7a2443204243b11662427309e2fd5263b604 100644 (file)
--- 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 f49bc5c8d1529bf168aa0988281162d23af0227c..22fc1ac1d79d649ec1aeee9c8d5b81284e1f5ae0 100644 (file)
--- 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 4514fc7fb4e2112e03bbd31b5b95b8fdbbed3983..4925a3f4369725526798de2e527ae1522c5ed07b 100644 (file)
--- 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 e399835a7bf8073a4bfbc9ec6d64056e229e4e6c..5c128bc7d13973bd896f7c64921cac312239a51f 100644 (file)
--- 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 d4b7bce11f8ec53fda62c1d1ecf43cd6d8aa7edb..89fce62a1e076c425fd62c5963e9ece6e010aee5 100644 (file)
--- 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 a74a34cb65e71698861d96e9d044cecdffc5156e..20285f8daa224d5ac73959a1a91843e4584c8932 100644 (file)
--- 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 3b78e406a79a45a76ff3fcf2b6cce4fe2189f925..8c187e3f1b9433ead1f0e62002e3b088398f24ff 100644 (file)
--- 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 744cbd2a3e08a0a4a1d18a5039e76f6dd0f7ab45..695c1bbe33c9481930270e8e3950576ca0eb361c 100644 (file)
--- 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 524208340aa28b6a64cd3aa61046a57e0ff2e968..a8961da91d7cc10b8a00a409c6ecc8d2bae2d18f 100644 (file)
--- 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 a004218562c22f0d4b69c6b2b9a9e3369cfb9f3f..233601caf3ca88c9a2a6c1a149a4fada047d3e8d 100644 (file)
--- 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 5405e5d603dbf20b8fa48137cfdcf4d3bfe6b148..6507137f83e03d0c605a777856170f0c728cdd34 100644 (file)
--- 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 f2885b1fc102a7c3f7b2989ea406b6539911dde1..08fedef4ba70eb5b81402d17f9c6ae4edef61a0d 100644 (file)
--- 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 ac0d92ace8a66939b26b879f782ddc82526e8fa8..57e7cc6e98138930c063a7a93709cedd36b09bef 100644 (file)
--- 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 dcef9a4b2611667196c58e12077543adc3333ef8..d801e06928a9c19e4c04decc9649459f18b42d62 100644 (file)
--- 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 6958e45469e3f161d971edcd626d27398965555b..3fa41194fa5e1c6911c8cb002dcfcc7cadd9fc76 100644 (file)
--- 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 f952a2a3a54bfe966e05359bce8bc3b6eb8a77b9..6dbec414a0a005447dd93091ebdbb36836f542ac 100644 (file)
--- 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 0e81aa034458b69f28a48eb92c266e1b2526cab3..2eb5f18e35223663f16080c263a66dcb62e8075a 100644 (file)
--- 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 2ff733554f871010be3d0c05367621232b28efe3..af4e609e2dafea9ab4bc1da0830e6eeb8a8fb9b8 100644 (file)
--- 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 f7271ad2bdcd5edaddd51f1a7fe9e858e6fc965b..3e8a54facab49b8d969169db92cc954130deccb5 100644 (file)
--- 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 a482aebee8ba6e6f104e5f18a1563b89709813fd..8d9a37c574fcf37b5151c50bf324a2822b08172a 100644 (file)
--- 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 da1c0037d0d1b423336813a5b32ef0f450d911e7..db846fff00d7acaaa1e12b56de6196b325fc83cd 100644 (file)
--- 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 54eb83ebc6b0cb413f8a13426cbb674eb0a23caa..bcab84642310fdbf3b40d28e68d1f720a51e169d 100644 (file)
--- 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 df0ce70f4f3ad4e112ad8cc4b6889cb0567df932..a32a33c3a52c37d1a4588a9409b00b3e59cd1362 100644 (file)
--- 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 9fedf75f8890d7fc890b0d61037ac4765ebacc77..773a7f0ba88dacb917789f8c568614f59adf8b4d 100644 (file)
--- 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 2b6bf01908b8f67ac10e14f5b7200146fd92f57e..e6fb9025f47af7bf920e3b25e57ed59a779ad664 100644 (file)
--- 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 60a279e9f90dfe4acadb6a13b060f24c3d59b824..5b8c37fcf15a2fe77af9c7574967c3602ee86dd1 100644 (file)
--- 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 07fe2c095ae2f4a2a0b79d06d1f8b1706c9a5088..76181651f8650db42acef4b3d2ee27906cadea96 100644 (file)
--- 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 07a1fb8f9fbeaf959b1eb8fdcb5f7e8d90718ce5..989509878a39ebe449bdca2050f55d37ba4cc37f 100644 (file)
--- 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 352a36164ce808abb7716e25f0037bd42ad65d15..929360efaf7b54d73152431681819b2a4e430ae7 100644 (file)
--- 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 47564a1f05309779d754d4da402ea624a86ebf33..8a4a7c26fa99ba6e774c6da49ff9d64b9fa5f2a4 100644 (file)
--- 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 7ce3c39888f68c476e52856b369d5b793cfa8823..5601bbdc9adc31faa5bf74e415fbe70a8b3b8efb 100644 (file)
--- 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 d59d30a48dd4d3041b2238674c9d49bb20a290ba..2ddadc9226af3b684354f14dc0578ebfe8d489c5 100644 (file)
--- 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 24722b00e835bfb21a62391083e015e6fa027478..13c640ce04a75283074626d1337445e502cd7f28 100644 (file)
--- 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 fb999eb8ad5d4dd000f9438c913dbfe6e1d35419..8eb5b248b6762f76bcd984ade20545c0b679363b 100644 (file)
--- 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 038b053623fd5a14f2f8e78bf06975c7dbaa1aac..1f6e46d0bf67517df62161ab2b1038b526579293 100644 (file)
--- 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 9fa34c6c2f45617c9ecd6acb331a2309babe97ea..183b1fe1cc478988263bef51e0bcd28423581cd4 100644 (file)
--- 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 ca04de85cd2dc7eceb35a853bdabddf95ae0e325..7b9f8b1422d0dbb135a847bc2f1c210bf4d19a32 100644 (file)
--- 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 14339be16bce656c6155a04d6af06c649084760d..9bf42817b17122832cc36252068c3fd615265f95 100644 (file)
--- 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 4c0ef3e503f2a2d8052849a2eb259b3be467991f..d079c2acfb4f9dfd11b61b361930228bf6476e7f 100644 (file)
--- 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 97f821dd6f7f2caf65fa5cc3efadb02a2872edaf..7a095d5ec2342373dafb16f274d5bb5268baf64a 100644 (file)
--- 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 c3e53a542ebfe2b942643d4345bd2f5f0e8c32ba..362da4aba54d1c9c074c19ca974aa6fd3fdc3721 100644 (file)
--- 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 7fe8c8c88c288eb1460ff5047a654e2740fe9b53..dda0458868e15e5c01034e5ee3ef186be89b6eb7 100644 (file)
--- 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 5e29f9b2664d346ac204578515596f5edfb67851..288652a4eef5ab7d2879bbbdfa2eed9e587b6cb4 100644 (file)
--- 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 adc1162d3a52db25ef969dff5b77575c1ce0e9a0..dd13288e064c2c373be9e1b66fd9bcb02ca9da97 100644 (file)
--- 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 43d519610a5b4de56ffcfb544d8cdda1c208a48c..c2a4360b2fca7ff0b4f42ce9cb553ebaad23b297 100644 (file)
--- 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 4440262060f15fc00bec2decc63e15ecf3ab5e59..acf81cdcea561c38e6390b72e7677e98cbd0f6d4 100644 (file)
--- 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 864b7b49c41cd6ea416b7e65e4ac1311a33486c6..917da95a9b4feb47c1e25c87af767373c0d41664 100644 (file)
--- 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 d7217a5223e7d1cbb81684842039f2056e5a310f..8ec0cd31f5d6b304cb5e153f50030d07094054cd 100644 (file)
--- 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 33e20f33e5e3216ecdfa2e8ba8049e28796f7188..12641443a2468e58126da12a26954eac33cbf8fd 100644 (file)
--- 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 9d3c033a802ace44d8170fed04ebd9bee4391633..cc901c9c2866876f33dbf1fd8a48a4f8bb083652 100644 (file)
--- 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 bd3e1794726233dd9be26f704a4466af4d918c2d..183e102174828d76c2ba3e496dc0fb173b047fa3 100644 (file)
--- 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 507d0d05430dd59e702e7c17ad1213cceb999e5c..f01d9945dc9ba66a89f1957af7a1eb74a2b2bb4d 100644 (file)
--- 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 735f39c228889cc47a87e0a7405da47d1f0f7bfa..15b4a02314efcf65b9b622894548a0631869780c 100644 (file)
--- 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 e5abcd2117301b0866959f19e0935490d1b8600f..ec4ae3cf7d1eb8f63f4e24f5614509d1df00612a 100644 (file)
--- 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 d615149dbf8092db9640b753fcb14b55ddd1b306..770c333cc83a0a1f7909721662711257e63ac5bc 100644 (file)
--- 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 ae5d9ff4b9bddf80fe6c3588dd074d2932a6245f..5941186b9894526d8232351348befcbc3bbfcacf 100644 (file)
--- 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 dfcdaa5344be0731b05454a92a6f7fbfcc16c268..dd4d4d824350eedbf9a081113d28e00017e0fcdf 100644 (file)
--- 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 ebc78bbacf398099f271bc1e045b7fa033eeeb64..75b1334a66250bb96b7cb82f747c1318829617f7 100644 (file)
--- 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 af4d9db098310b2c94b0d2006a8c56d7c12f81e8..aaa8dac0b6023e9254ee8db24a2b8445ff89420a 100644 (file)
--- 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 4ff38099ede2c1284e2dc14b077038534ea2fa2a..76b852356fe983afce2b896408fba539199d4034 100644 (file)
--- 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 9b1db41b46fd0a9d8a00a8c8ad232d890cd57a0b..0ddd1fcc137b36606bfaaf3e6dd86c0a07642c93 100644 (file)
--- 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 0df10992e241e29fc6ab24d4653d1a30195f3d54..b9a9045cc23a5de5b8b8008c83950dfe09b4de80 100644 (file)
--- 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 5b1919c10aead3f5b00ed3a3f206120bbb6dbf84..4c8f2c2f2291e25bb6b2b7dc05b7dc259b46b1c7 100644 (file)
--- 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 f8fcc963824758f1b80067922cdde32e44483508..43e339401da309d9bb12f70ed397a3970a6a1862 100644 (file)
--- 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 d85c93c38cb4732ea1aa11ba30b1b9525c123755..0c65cfea1280d0ea7c987ade3075dba0d7a3e11a 100644 (file)
--- 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 c43a98be54c7796d0c960340b065a0b66cd5442e..1301e8d1747b394a2fc59bfb73f08d5f9d4ca994 100644 (file)
--- 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 96636fe91a22783c25b27bbe241403a6a06d7a37..034e0b1e23096f3f816df192f0c0fa1afa8663a1 100644 (file)
--- 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 f376afbe2a0921e861572f2d5173c1d87fa82820..51103d957df393514ffbeee851c1fc1bbf373f7e 100644 (file)
--- 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 b38f2619ccdd5ab93b2d4b8a6c0bb3b131cde8f5..14c7696fb4c1d429ce929f7195dcffce78ac6474 100644 (file)
--- 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 1b5f7086e0b643314236f31d9e0381bc851a9fef..659eaa03f59427913818db7b52a23187c9689280 100644 (file)
--- 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 ea3217fd6bec874e9a266d3cc49e85e9b9cfa4c2..10dd6d19ef17ef71f9e0080db799c95a57153fa3 100644 (file)
--- 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"