From a1cec91afaca91968b46e695533c10ad2a3f73d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 31 Aug 2007 05:53:55 +0000 Subject: [PATCH] move our stuff off the Q* namespace git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19935 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/qmake/qt4/qt4.pro | 226 ++++++++-------- development/scons/scons_manifest.py | 228 ++++++++-------- src/frontends/qt4/Action.cpp | 4 +- src/frontends/qt4/Action.h | 8 +- src/frontends/qt4/ChangeLog | 76 +++--- src/frontends/qt4/Dialogs.cpp | 168 ++++++------ .../qt4/{QAbout.cpp => GuiAbout.cpp} | 14 +- src/frontends/qt4/{QAbout.h => GuiAbout.h} | 14 +- src/frontends/qt4/GuiApplication.cpp | 2 +- .../qt4/{QBibitem.cpp => GuiBibitem.cpp} | 26 +- .../qt4/{QBibitem.h => GuiBibitem.h} | 20 +- .../qt4/{QBibtex.cpp => GuiBibtex.cpp} | 60 ++--- src/frontends/qt4/{QBibtex.h => GuiBibtex.h} | 22 +- src/frontends/qt4/{QBox.cpp => GuiBox.cpp} | 38 +-- src/frontends/qt4/{QBox.h => GuiBox.h} | 20 +- .../qt4/{QBranch.cpp => GuiBranch.cpp} | 28 +- src/frontends/qt4/{QBranch.h => GuiBranch.h} | 18 +- .../qt4/{QBranches.cpp => GuiBranches.cpp} | 28 +- .../qt4/{QBranches.h => GuiBranches.h} | 8 +- .../qt4/{QChanges.cpp => GuiChanges.cpp} | 36 +-- .../qt4/{QChanges.h => GuiChanges.h} | 20 +- .../qt4/{QCharacter.cpp => GuiCharacter.cpp} | 28 +- .../qt4/{QCharacter.h => GuiCharacter.h} | 20 +- .../qt4/{QCitation.cpp => GuiCitation.cpp} | 32 +-- .../qt4/{QCitation.h => GuiCitation.h} | 8 +- ...tationDialog.cpp => GuiCitationDialog.cpp} | 68 ++--- ...{QCitationDialog.h => GuiCitationDialog.h} | 20 +- ...CommandBuffer.cpp => GuiCommandBuffer.cpp} | 26 +- .../{QCommandBuffer.h => GuiCommandBuffer.h} | 12 +- .../{QCommandEdit.cpp => GuiCommandEdit.cpp} | 12 +- .../qt4/{QCommandEdit.h => GuiCommandEdit.h} | 6 +- ...miterDialog.cpp => GuiDelimiterDialog.cpp} | 36 +-- ...DelimiterDialog.h => GuiDelimiterDialog.h} | 18 +- .../{QDialogView.cpp => GuiDialogView.cpp} | 32 +-- .../qt4/{QDialogView.h => GuiDialogView.h} | 15 +- .../qt4/{QDocument.cpp => GuiDocument.cpp} | 80 +++--- .../qt4/{QDocument.h => GuiDocument.h} | 26 +- src/frontends/qt4/{QERT.cpp => GuiERT.cpp} | 28 +- src/frontends/qt4/{QERT.h => GuiERT.h} | 24 +- .../qt4/{QErrorList.cpp => GuiErrorList.cpp} | 30 +-- .../qt4/{QErrorList.h => GuiErrorList.h} | 20 +- .../qt4/{QExternal.cpp => GuiExternal.cpp} | 58 ++--- .../qt4/{QExternal.h => GuiExternal.h} | 20 +- .../qt4/{QFloat.cpp => GuiFloat.cpp} | 18 +- src/frontends/qt4/{QFloat.h => GuiFloat.h} | 12 +- .../{QFloatDialog.cpp => GuiFloatDialog.cpp} | 14 +- .../qt4/{QFloatDialog.h => GuiFloatDialog.h} | 10 +- .../{QFontExample.cpp => GuiFontExample.cpp} | 10 +- .../qt4/{QFontExample.h => GuiFontExample.h} | 6 +- .../qt4/{QGraphics.cpp => GuiGraphics.cpp} | 26 +- .../qt4/{QGraphics.h => GuiGraphics.h} | 14 +- ...aphicsDialog.cpp => GuiGraphicsDialog.cpp} | 36 +-- ...{QGraphicsDialog.h => GuiGraphicsDialog.h} | 10 +- .../qt4/{QGraphicsUi.h => GuiGraphicsUi.h} | 0 .../qt4/{QLImage.cpp => GuiImage.cpp} | 4 +- src/frontends/qt4/{QLImage.h => GuiImage.h} | 2 +- src/frontends/qt4/GuiImplementation.cpp | 8 +- src/frontends/qt4/GuiImplementation.h | 6 +- .../qt4/{QInclude.cpp => GuiInclude.cpp} | 46 ++-- .../qt4/{QInclude.h => GuiInclude.h} | 18 +- .../qt4/{QIndex.cpp => GuiIndex.cpp} | 32 +-- src/frontends/qt4/{QIndex.h => GuiIndex.h} | 20 +- .../qt4/{QKeySymbol.cpp => GuiKeySymbol.cpp} | 62 ++--- .../qt4/{QKeySymbol.h => GuiKeySymbol.h} | 13 +- .../qt4/{QListings.cpp => GuiListings.cpp} | 44 ++-- .../qt4/{QListings.h => GuiListings.h} | 16 +- src/frontends/qt4/{QLog.cpp => GuiLog.cpp} | 26 +- src/frontends/qt4/{QLog.h => GuiLog.h} | 24 +- ...trixDialog.cpp => GuiMathMatrixDialog.cpp} | 26 +- ...thMatrixDialog.h => GuiMathMatrixDialog.h} | 18 +- .../qt4/{QLMenubar.cpp => GuiMenubar.cpp} | 32 +-- .../qt4/{QLMenubar.h => GuiMenubar.h} | 18 +- .../qt4/{QNomencl.cpp => GuiNomencl.cpp} | 34 +-- .../qt4/{QNomencl.h => GuiNomencl.h} | 20 +- src/frontends/qt4/{QNote.cpp => GuiNote.cpp} | 28 +- src/frontends/qt4/{QNote.h => GuiNote.h} | 18 +- .../qt4/{QLPainter.cpp => GuiPainter.cpp} | 6 +- .../qt4/{QLPainter.h => GuiPainter.h} | 2 +- .../qt4/{QParagraph.cpp => GuiParagraph.cpp} | 36 +-- .../qt4/{QParagraph.h => GuiParagraph.h} | 20 +- .../qt4/{QLPopupMenu.cpp => GuiPopupMenu.cpp} | 28 +- .../qt4/{QLPopupMenu.h => GuiPopupMenu.h} | 10 +- .../qt4/{QPrefs.cpp => GuiPrefs.cpp} | 62 ++--- src/frontends/qt4/{QPrefs.h => GuiPrefs.h} | 76 +++--- .../qt4/{QPrint.cpp => GuiPrint.cpp} | 28 +- src/frontends/qt4/{QPrint.h => GuiPrint.h} | 14 +- .../{QLPrintDialog.cpp => GuiPrintDialog.cpp} | 22 +- .../qt4/{QLPrintDialog.h => GuiPrintDialog.h} | 10 +- src/frontends/qt4/{QRef.cpp => GuiRef.cpp} | 60 ++--- src/frontends/qt4/{QRef.h => GuiRef.h} | 20 +- .../qt4/{QSearch.cpp => GuiSearch.cpp} | 36 +-- src/frontends/qt4/{QSearch.h => GuiSearch.h} | 20 +- ...ionManager.cpp => GuiSelectionManager.cpp} | 56 ++-- ...lectionManager.h => GuiSelectionManager.h} | 15 +- .../qt4/{QSendto.cpp => GuiSendto.cpp} | 30 +-- src/frontends/qt4/{QSendto.h => GuiSendto.h} | 20 +- .../qt4/{QSetBorder.cpp => GuiSetBorder.cpp} | 58 ++--- .../qt4/{QSetBorder.h => GuiSetBorder.h} | 6 +- .../qt4/{QShowFile.cpp => GuiShowFile.cpp} | 24 +- .../qt4/{QShowFile.h => GuiShowFile.h} | 20 +- ...{QSpellchecker.cpp => GuiSpellchecker.cpp} | 48 ++-- .../{QSpellchecker.h => GuiSpellchecker.h} | 20 +- .../qt4/{QTabular.cpp => GuiTabular.cpp} | 102 ++++---- .../qt4/{QTabular.h => GuiTabular.h} | 20 +- ...TabularCreate.cpp => GuiTabularCreate.cpp} | 26 +- .../{QTabularCreate.h => GuiTabularCreate.h} | 20 +- .../qt4/{QTexinfo.cpp => GuiTexinfo.cpp} | 39 +-- .../qt4/{QTexinfo.h => GuiTexinfo.h} | 20 +- .../qt4/{QThesaurus.cpp => GuiThesaurus.cpp} | 38 +-- .../qt4/{QThesaurus.h => GuiThesaurus.h} | 20 +- src/frontends/qt4/{QToc.cpp => GuiToc.cpp} | 30 +-- src/frontends/qt4/{QToc.h => GuiToc.h} | 8 +- .../qt4/{QLToolbar.cpp => GuiToolbar.cpp} | 44 ++-- .../qt4/{QLToolbar.h => GuiToolbar.h} | 28 +- .../qt4/{QURLDialog.cpp => GuiURLDialog.cpp} | 12 +- .../qt4/{QURLDialog.h => GuiURLDialog.h} | 12 +- .../qt4/{QVSpace.cpp => GuiVSpace.cpp} | 30 +-- src/frontends/qt4/{QVSpace.h => GuiVSpace.h} | 20 +- src/frontends/qt4/GuiView.cpp | 137 +++++----- src/frontends/qt4/GuiView.h | 12 +- .../{QViewSource.cpp => GuiViewSource.cpp} | 18 +- .../qt4/{QViewSource.h => GuiViewSource.h} | 14 +- src/frontends/qt4/GuiWorkArea.cpp | 11 +- src/frontends/qt4/{QWrap.cpp => GuiWrap.cpp} | 28 +- src/frontends/qt4/{QWrap.h => GuiWrap.h} | 18 +- src/frontends/qt4/KeySymbol.cpp | 24 -- src/frontends/qt4/Makefile.am | 246 +++++++++--------- src/frontends/qt4/TocModel.cpp | 2 +- src/frontends/qt4/TocWidget.cpp | 4 +- src/frontends/qt4/TocWidget.h | 8 +- src/frontends/qt4/UrlView.cpp | 6 +- src/frontends/qt4/UrlView.h | 6 +- src/frontends/qt4/qt_helpers.h | 2 +- src/frontends/qt4/ui/AboutUi.ui | 4 +- src/frontends/qt4/ui/AskForTextUi.ui | 4 +- src/frontends/qt4/ui/BibitemUi.ui | 4 +- src/frontends/qt4/ui/BibtexAddUi.ui | 4 +- src/frontends/qt4/ui/BibtexUi.ui | 4 +- src/frontends/qt4/ui/BoxUi.ui | 4 +- src/frontends/qt4/ui/BranchUi.ui | 4 +- src/frontends/qt4/ui/ChangesUi.ui | 4 +- src/frontends/qt4/ui/CharacterUi.ui | 4 +- src/frontends/qt4/ui/CitationUi.ui | 4 +- src/frontends/qt4/ui/DelimiterUi.ui | 4 +- src/frontends/qt4/ui/DocumentUi.ui | 4 +- src/frontends/qt4/ui/ERTUi.ui | 4 +- src/frontends/qt4/ui/ErrorListUi.ui | 4 +- src/frontends/qt4/ui/ExternalUi.ui | 4 +- src/frontends/qt4/ui/FloatUi.ui | 4 +- src/frontends/qt4/ui/GraphicsUi.ui | 4 +- src/frontends/qt4/ui/IncludeUi.ui | 4 +- src/frontends/qt4/ui/IndexUi.ui | 4 +- src/frontends/qt4/ui/ListingsUi.ui | 4 +- src/frontends/qt4/ui/LogUi.ui | 7 +- src/frontends/qt4/ui/MathMatrixUi.ui | 7 +- src/frontends/qt4/ui/MathsUi.ui | 3 - src/frontends/qt4/ui/NomenclUi.ui | 4 +- src/frontends/qt4/ui/NoteUi.ui | 7 +- src/frontends/qt4/ui/NumberingUi.ui | 3 - src/frontends/qt4/ui/PageLayoutUi.ui | 3 - src/frontends/qt4/ui/ParagraphUi.ui | 4 +- src/frontends/qt4/ui/PreambleUi.ui | 3 - src/frontends/qt4/ui/PrefColorsUi.ui | 4 +- src/frontends/qt4/ui/PrefConvertersUi.ui | 4 +- src/frontends/qt4/ui/PrefCopiersUi.ui | 4 +- src/frontends/qt4/ui/PrefCygwinPathUi.ui | 4 +- src/frontends/qt4/ui/PrefDateUi.ui | 7 +- src/frontends/qt4/ui/PrefDisplayUi.ui | 7 +- src/frontends/qt4/ui/PrefFileformatsUi.ui | 4 +- src/frontends/qt4/ui/PrefIdentityUi.ui | 7 +- src/frontends/qt4/ui/PrefKeyboardUi.ui | 4 +- src/frontends/qt4/ui/PrefLanguageUi.ui | 7 +- src/frontends/qt4/ui/PrefLatexUi.ui | 7 +- src/frontends/qt4/ui/PrefPathsUi.ui | 7 +- src/frontends/qt4/ui/PrefPlaintextUi.ui | 7 +- src/frontends/qt4/ui/PrefPrinterUi.ui | 4 +- src/frontends/qt4/ui/PrefScreenFontsUi.ui | 17 +- src/frontends/qt4/ui/PrefSpellcheckerUi.ui | 7 +- src/frontends/qt4/ui/PrefUi.ui | 4 +- src/frontends/qt4/ui/PrefsUi.ui | 7 +- src/frontends/qt4/ui/PrintUi.ui | 7 +- src/frontends/qt4/ui/RefUi.ui | 7 +- src/frontends/qt4/ui/SearchUi.ui | 7 +- src/frontends/qt4/ui/SendtoUi.ui | 7 +- src/frontends/qt4/ui/ShowFileUi.ui | 7 +- src/frontends/qt4/ui/SpellcheckerUi.ui | 7 +- src/frontends/qt4/ui/TabularCreateUi.ui | 7 +- src/frontends/qt4/ui/TabularUi.ui | 13 +- src/frontends/qt4/ui/TexinfoUi.ui | 4 +- src/frontends/qt4/ui/ThesaurusUi.ui | 7 +- src/frontends/qt4/ui/TocUi.ui | 4 +- src/frontends/qt4/ui/URLUi.ui | 7 +- src/frontends/qt4/ui/VSpaceUi.ui | 4 +- src/frontends/qt4/ui/ViewSourceUi.ui | 4 +- src/frontends/qt4/ui/WrapUi.ui | 7 +- 195 files changed, 2162 insertions(+), 2276 deletions(-) rename src/frontends/qt4/{QAbout.cpp => GuiAbout.cpp} (91%) rename src/frontends/qt4/{QAbout.h => GuiAbout.h} (74%) rename src/frontends/qt4/{QBibitem.cpp => GuiBibitem.cpp} (77%) rename src/frontends/qt4/{QBibitem.h => GuiBibitem.h} (71%) rename src/frontends/qt4/{QBibtex.cpp => GuiBibtex.cpp} (88%) rename src/frontends/qt4/{QBibtex.h => GuiBibtex.h} (79%) rename src/frontends/qt4/{QBox.cpp => GuiBox.cpp} (94%) rename src/frontends/qt4/{QBox.h => GuiBox.h} (81%) rename src/frontends/qt4/{QBranch.cpp => GuiBranch.cpp} (79%) rename src/frontends/qt4/{QBranch.h => GuiBranch.h} (73%) rename src/frontends/qt4/{QBranches.cpp => GuiBranches.cpp} (84%) rename src/frontends/qt4/{QBranches.h => GuiBranches.h} (87%) rename src/frontends/qt4/{QChanges.cpp => GuiChanges.cpp} (74%) rename src/frontends/qt4/{QChanges.h => GuiChanges.h} (72%) rename src/frontends/qt4/{QCharacter.cpp => GuiCharacter.cpp} (91%) rename src/frontends/qt4/{QCharacter.h => GuiCharacter.h} (75%) rename src/frontends/qt4/{QCitation.cpp => GuiCitation.cpp} (84%) rename src/frontends/qt4/{QCitation.h => GuiCitation.h} (94%) rename src/frontends/qt4/{QCitationDialog.cpp => GuiCitationDialog.cpp} (85%) rename src/frontends/qt4/{QCitationDialog.h => GuiCitationDialog.h} (85%) rename src/frontends/qt4/{QCommandBuffer.cpp => GuiCommandBuffer.cpp} (91%) rename src/frontends/qt4/{QCommandBuffer.h => GuiCommandBuffer.h} (83%) rename src/frontends/qt4/{QCommandEdit.cpp => GuiCommandEdit.cpp} (82%) rename src/frontends/qt4/{QCommandEdit.h => GuiCommandEdit.h} (88%) rename src/frontends/qt4/{QDelimiterDialog.cpp => GuiDelimiterDialog.cpp} (84%) rename src/frontends/qt4/{QDelimiterDialog.h => GuiDelimiterDialog.h} (73%) rename src/frontends/qt4/{QDialogView.cpp => GuiDialogView.cpp} (71%) rename src/frontends/qt4/{QDialogView.h => GuiDialogView.h} (89%) rename src/frontends/qt4/{QDocument.cpp => GuiDocument.cpp} (95%) rename src/frontends/qt4/{QDocument.h => GuiDocument.h} (88%) rename src/frontends/qt4/{QERT.cpp => GuiERT.cpp} (78%) rename src/frontends/qt4/{QERT.h => GuiERT.h} (67%) rename src/frontends/qt4/{QErrorList.cpp => GuiErrorList.cpp} (74%) rename src/frontends/qt4/{QErrorList.h => GuiErrorList.h} (71%) rename src/frontends/qt4/{QExternal.cpp => GuiExternal.cpp} (94%) rename src/frontends/qt4/{QExternal.h => GuiExternal.h} (79%) rename src/frontends/qt4/{QFloat.cpp => GuiFloat.cpp} (73%) rename src/frontends/qt4/{QFloat.h => GuiFloat.h} (73%) rename src/frontends/qt4/{QFloatDialog.cpp => GuiFloatDialog.cpp} (79%) rename src/frontends/qt4/{QFloatDialog.h => GuiFloatDialog.h} (79%) rename src/frontends/qt4/{QFontExample.cpp => GuiFontExample.cpp} (75%) rename src/frontends/qt4/{QFontExample.h => GuiFontExample.h} (86%) rename src/frontends/qt4/{QGraphics.cpp => GuiGraphics.cpp} (96%) rename src/frontends/qt4/{QGraphics.h => GuiGraphics.h} (77%) rename src/frontends/qt4/{QGraphicsDialog.cpp => GuiGraphicsDialog.cpp} (90%) rename src/frontends/qt4/{QGraphicsDialog.h => GuiGraphicsDialog.h} (85%) rename src/frontends/qt4/{QGraphicsUi.h => GuiGraphicsUi.h} (100%) rename src/frontends/qt4/{QLImage.cpp => GuiImage.cpp} (99%) rename src/frontends/qt4/{QLImage.h => GuiImage.h} (99%) rename src/frontends/qt4/{QInclude.cpp => GuiInclude.cpp} (91%) rename src/frontends/qt4/{QInclude.h => GuiInclude.h} (81%) rename src/frontends/qt4/{QIndex.cpp => GuiIndex.cpp} (78%) rename src/frontends/qt4/{QIndex.h => GuiIndex.h} (70%) rename src/frontends/qt4/{QKeySymbol.cpp => GuiKeySymbol.cpp} (80%) rename src/frontends/qt4/{QKeySymbol.h => GuiKeySymbol.h} (92%) rename src/frontends/qt4/{QListings.cpp => GuiListings.cpp} (95%) rename src/frontends/qt4/{QListings.h => GuiListings.h} (83%) rename src/frontends/qt4/{QLog.cpp => GuiLog.cpp} (87%) rename src/frontends/qt4/{QLog.h => GuiLog.h} (77%) rename src/frontends/qt4/{QMathMatrixDialog.cpp => GuiMathMatrixDialog.cpp} (79%) rename src/frontends/qt4/{QMathMatrixDialog.h => GuiMathMatrixDialog.h} (70%) rename src/frontends/qt4/{QLMenubar.cpp => GuiMenubar.cpp} (92%) rename src/frontends/qt4/{QLMenubar.h => GuiMenubar.h} (77%) rename src/frontends/qt4/{QNomencl.cpp => GuiNomencl.cpp} (79%) rename src/frontends/qt4/{QNomencl.h => GuiNomencl.h} (71%) rename src/frontends/qt4/{QNote.cpp => GuiNote.cpp} (83%) rename src/frontends/qt4/{QNote.h => GuiNote.h} (74%) rename src/frontends/qt4/{QLPainter.cpp => GuiPainter.cpp} (99%) rename src/frontends/qt4/{QLPainter.h => GuiPainter.h} (99%) rename src/frontends/qt4/{QParagraph.cpp => GuiParagraph.cpp} (89%) rename src/frontends/qt4/{QParagraph.h => GuiParagraph.h} (77%) rename src/frontends/qt4/{QLPopupMenu.cpp => GuiPopupMenu.cpp} (85%) rename src/frontends/qt4/{QLPopupMenu.h => GuiPopupMenu.h} (85%) rename src/frontends/qt4/{QPrefs.cpp => GuiPrefs.cpp} (97%) rename src/frontends/qt4/{QPrefs.h => GuiPrefs.h} (72%) rename src/frontends/qt4/{QPrint.cpp => GuiPrint.cpp} (82%) rename src/frontends/qt4/{QPrint.h => GuiPrint.h} (74%) rename src/frontends/qt4/{QLPrintDialog.cpp => GuiPrintDialog.cpp} (85%) rename src/frontends/qt4/{QLPrintDialog.h => GuiPrintDialog.h} (81%) rename src/frontends/qt4/{QRef.cpp => GuiRef.cpp} (89%) rename src/frontends/qt4/{QRef.h => GuiRef.h} (85%) rename src/frontends/qt4/{QSearch.cpp => GuiSearch.cpp} (81%) rename src/frontends/qt4/{QSearch.h => GuiSearch.h} (78%) rename src/frontends/qt4/{QSelectionManager.cpp => GuiSelectionManager.cpp} (85%) rename src/frontends/qt4/{QSelectionManager.h => GuiSelectionManager.h} (94%) rename src/frontends/qt4/{QSendto.cpp => GuiSendto.cpp} (85%) rename src/frontends/qt4/{QSendto.h => GuiSendto.h} (77%) rename src/frontends/qt4/{QSetBorder.cpp => GuiSetBorder.cpp} (75%) rename src/frontends/qt4/{QSetBorder.h => GuiSetBorder.h} (92%) rename src/frontends/qt4/{QShowFile.cpp => GuiShowFile.cpp} (73%) rename src/frontends/qt4/{QShowFile.h => GuiShowFile.h} (67%) rename src/frontends/qt4/{QSpellchecker.cpp => GuiSpellchecker.cpp} (76%) rename src/frontends/qt4/{QSpellchecker.h => GuiSpellchecker.h} (75%) rename src/frontends/qt4/{QTabular.cpp => GuiTabular.cpp} (92%) rename src/frontends/qt4/{QTabular.h => GuiTabular.h} (87%) rename src/frontends/qt4/{QTabularCreate.cpp => GuiTabularCreate.cpp} (72%) rename src/frontends/qt4/{QTabularCreate.h => GuiTabularCreate.h} (65%) rename src/frontends/qt4/{QTexinfo.cpp => GuiTexinfo.cpp} (79%) rename src/frontends/qt4/{QTexinfo.h => GuiTexinfo.h} (78%) rename src/frontends/qt4/{QThesaurus.cpp => GuiThesaurus.cpp} (78%) rename src/frontends/qt4/{QThesaurus.h => GuiThesaurus.h} (75%) rename src/frontends/qt4/{QToc.cpp => GuiToc.cpp} (74%) rename src/frontends/qt4/{QToc.h => GuiToc.h} (89%) rename src/frontends/qt4/{QLToolbar.cpp => GuiToolbar.cpp} (91%) rename src/frontends/qt4/{QLToolbar.h => GuiToolbar.h} (77%) rename src/frontends/qt4/{QURLDialog.cpp => GuiURLDialog.cpp} (81%) rename src/frontends/qt4/{QURLDialog.h => GuiURLDialog.h} (74%) rename src/frontends/qt4/{QVSpace.cpp => GuiVSpace.cpp} (89%) rename src/frontends/qt4/{QVSpace.h => GuiVSpace.h} (72%) rename src/frontends/qt4/{QViewSource.cpp => GuiViewSource.cpp} (93%) rename src/frontends/qt4/{QViewSource.h => GuiViewSource.h} (81%) rename src/frontends/qt4/{QWrap.cpp => GuiWrap.cpp} (86%) rename src/frontends/qt4/{QWrap.h => GuiWrap.h} (71%) delete mode 100644 src/frontends/qt4/KeySymbol.cpp diff --git a/development/qmake/qt4/qt4.pro b/development/qmake/qt4/qt4.pro index b15755c5be..77c9a8c95f 100644 --- a/development/qmake/qt4/qt4.pro +++ b/development/qmake/qt4/qt4.pro @@ -21,79 +21,79 @@ HPP += ColorCache.h HPP += DockView.h HPP += EmptyTable.h HPP += FloatPlacement.h +HPP += GuiAbout.h HPP += GuiApplication.h +HPP += GuiBibitem.h +HPP += GuiBibtex.h +HPP += GuiBox.h +HPP += GuiBranches.h +HPP += GuiBranch.h +HPP += GuiChanges.h +HPP += GuiCharacter.h +HPP += GuiCitationDialog.h +HPP += GuiCitation.h HPP += GuiClipboard.h +HPP += GuiCommandBuffer.h +HPP += GuiCommandEdit.h +HPP += GuiDelimiterDialog.h +HPP += GuiDialogView.h +HPP += GuiDocument.h +HPP += GuiErrorList.h +HPP += GuiERT.h +HPP += GuiExternal.h +HPP += GuiFloatDialog.h +HPP += GuiFloat.h +HPP += GuiFontExample.h HPP += GuiFontLoader.h HPP += GuiFontMetrics.h +HPP += GuiGraphicsDialog.h +HPP += GuiGraphics.h +HPP += GuiGraphicsUi.h +HPP += GuiImage.h HPP += GuiImplementation.h +HPP += GuiInclude.h +HPP += GuiIndex.h +HPP += GuiKeySymbol.h +HPP += GuiListings.h +HPP += GuiLog.h +HPP += GuiMathMatrixDialog.h +HPP += GuiMenubar.h +HPP += GuiNomencl.h +HPP += GuiNote.h +HPP += GuiPainter.h +HPP += GuiParagraph.h +HPP += GuiPopupMenu.h +HPP += GuiPrefs.h +HPP += GuiPrintDialog.h +HPP += GuiPrint.h +HPP += GuiRef.h +HPP += GuiSearch.h HPP += GuiSelection.h +HPP += GuiSendto.h +HPP += GuiSetBorder.h +HPP += GuiShowFile.h +HPP += GuiSpellchecker.h +HPP += Guit2BC.h +HPP += GuiTabularCreate.h +HPP += GuiTabular.h +HPP += GuiTexinfo.h +HPP += GuiThesaurus.h +HPP += GuiToc.h +HPP += GuiToolbar.h +HPP += GuiURLDialog.h HPP += GuiView.h +HPP += GuiViewSource.h +HPP += GuiVSpace.h HPP += GuiWorkArea.h +HPP += GuiWrap.h HPP += IconPalette.h HPP += InsertTableWidget.h HPP += LengthCombo.h HPP += LyXFileDialog.h HPP += PanelStack.h HPP += pch.h -HPP += QAbout.h -HPP += QBibitem.h -HPP += QBibtex.h -HPP += QBox.h -HPP += QBranches.h -HPP += QBranch.h -HPP += QChanges.h -HPP += QCharacter.h -HPP += QCitationDialog.h -HPP += QCitation.h -HPP += QCommandBuffer.h -HPP += QCommandEdit.h -HPP += QDelimiterDialog.h -HPP += QDialogView.h -HPP += QDocument.h -HPP += QErrorList.h -HPP += QERT.h -HPP += QExternal.h -HPP += QFloatDialog.h -HPP += QFloat.h -HPP += QFontExample.h -HPP += QGraphicsDialog.h -HPP += QGraphics.h -HPP += QGraphicsUi.h -HPP += QInclude.h -HPP += QIndex.h -HPP += QKeySymbol.h -HPP += QLImage.h -HPP += QListings.h HPP += qlkey.h -HPP += QLMenubar.h -HPP += QLog.h -HPP += QLPainter.h -HPP += QLPopupMenu.h -HPP += QLPrintDialog.h -HPP += QLToolbar.h -HPP += QMathMatrixDialog.h -HPP += QNomencl.h -HPP += QNote.h -HPP += QParagraph.h -HPP += QPrefs.h -HPP += QPrint.h -HPP += QRef.h -HPP += QSearch.h -HPP += QSendto.h -HPP += QSetBorder.h -HPP += QShowFile.h -HPP += QSpellchecker.h -HPP += Qt2BC.h -HPP += QTabularCreate.h -HPP += QTabular.h -HPP += QTexinfo.h HPP += qt_helpers.h -HPP += QThesaurus.h -HPP += QToc.h -HPP += QURLDialog.h -HPP += QViewSource.h -HPP += QVSpace.h -HPP += QWrap.h HPP += socket_callback.h HPP += TocModel.h HPP += TocWidget.h @@ -109,77 +109,77 @@ CPP += Dialogs.cpp CPP += EmptyTable.cpp CPP += FileDialog.cpp CPP += FloatPlacement.cpp +CPP += GuiAbout.cpp CPP += GuiApplication.cpp +CPP += GuiBibitem.cpp +CPP += GuiBibtex.cpp +CPP += GuiBox.cpp +CPP += GuiBranch.cpp +CPP += GuiBranches.cpp +CPP += GuiChanges.cpp +CPP += GuiCharacter.cpp +CPP += GuiCitation.cpp +CPP += GuiCitationDialog.cpp CPP += GuiClipboard.cpp +CPP += GuiCommandBuffer.cpp +CPP += GuiCommandEdit.cpp +CPP += GuiDelimiterDialog.cpp +CPP += GuiDialogView.cpp +CPP += GuiDocument.cpp +CPP += GuiErrorList.cpp +CPP += GuiERT.cpp +CPP += GuiExternal.cpp +CPP += GuiFloat.cpp +CPP += GuiFloatDialog.cpp +CPP += GuiFontExample.cpp CPP += GuiFontLoader.cpp CPP += GuiFontMetrics.cpp +CPP += GuiGraphics.cpp +CPP += GuiGraphicsDialog.cpp +CPP += GuiImage.cpp CPP += GuiImplementation.cpp +CPP += GuiInclude.cpp +CPP += GuiIndex.cpp +CPP += GuiKeySymbol.cpp +CPP += GuiListings.cpp +CPP += GuiLog.cpp +CPP += GuiMathMatrixDialog.cpp +CPP += GuiMenubar.cpp +CPP += GuiNomencl.cpp +CPP += GuiNote.cpp +CPP += GuiPainter.cpp +CPP += GuiParagraph.cpp +CPP += GuiPopupMenu.cpp +CPP += GuiPrefs.cpp +CPP += GuiPrint.cpp +CPP += GuiPrintDialog.cpp +CPP += GuiRef.cpp +CPP += GuiSearch.cpp CPP += GuiSelection.cpp +CPP += GuiSendto.cpp +CPP += GuiSetBorder.cpp +CPP += GuiShowFile.cpp +CPP += GuiSpellchecker.cpp +CPP += Guit2BC.cpp +CPP += GuiTabular.cpp +CPP += GuiTabularCreate.cpp +CPP += GuiTexinfo.cpp +CPP += GuiThesaurus.cpp +CPP += GuiToc.cpp +CPP += GuiToolbar.cpp +CPP += GuiURLDialog.cpp CPP += GuiView.cpp +CPP += GuiViewSource.cpp +CPP += GuiVSpace.cpp CPP += GuiWorkArea.cpp +CPP += GuiWrap.cpp CPP += IconPalette.cpp CPP += InsertTableWidget.cpp CPP += KeySymbol.cpp CPP += LengthCombo.cpp CPP += LyXFileDialog.cpp CPP += PanelStack.cpp -CPP += QAbout.cpp -CPP += QBibitem.cpp -CPP += QBibtex.cpp -CPP += QBox.cpp -CPP += QBranch.cpp -CPP += QBranches.cpp -CPP += QChanges.cpp -CPP += QCharacter.cpp -CPP += QCitation.cpp -CPP += QCitationDialog.cpp -CPP += QCommandBuffer.cpp -CPP += QCommandEdit.cpp -CPP += QDelimiterDialog.cpp -CPP += QDialogView.cpp -CPP += QDocument.cpp -CPP += QErrorList.cpp -CPP += QERT.cpp -CPP += QExternal.cpp -CPP += QFloat.cpp -CPP += QFloatDialog.cpp -CPP += QFontExample.cpp -CPP += QGraphics.cpp -CPP += QGraphicsDialog.cpp -CPP += QInclude.cpp -CPP += QIndex.cpp -CPP += QKeySymbol.cpp -CPP += QLImage.cpp -CPP += QListings.cpp -CPP += QLMenubar.cpp -CPP += QLog.cpp -CPP += QLPainter.cpp -CPP += QLPopupMenu.cpp -CPP += QLPrintDialog.cpp -CPP += QLToolbar.cpp -CPP += QMathMatrixDialog.cpp -CPP += QNomencl.cpp -CPP += QNote.cpp -CPP += QParagraph.cpp -CPP += QPrefs.cpp -CPP += QPrint.cpp -CPP += QRef.cpp -CPP += QSearch.cpp -CPP += QSendto.cpp -CPP += QSetBorder.cpp -CPP += QShowFile.cpp -CPP += QSpellchecker.cpp -CPP += Qt2BC.cpp -CPP += QTabular.cpp -CPP += QTabularCreate.cpp -CPP += QTexinfo.cpp CPP += qt_helpers.cpp -CPP += QThesaurus.cpp -CPP += QToc.cpp -CPP += QURLDialog.cpp -CPP += QViewSource.cpp -CPP += QVSpace.cpp -CPP += QWrap.cpp CPP += socket_callback.cpp CPP += TocModel.cpp CPP += TocWidget.cpp diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index a59a035f0a..7af5de5edd 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -847,76 +847,76 @@ src_frontends_qt4_header_files = Split(''' DockView.h EmptyTable.h FloatPlacement.h + GuiAbout.h GuiApplication.h + GuiBibitem.h + GuiBibtex.h + GuiBox.h + GuiBranches.h + GuiBranch.h + GuiChanges.h + GuiCharacter.h + GuiCharacter.h + GuiCitationDialog.h + GuiCitation.h GuiClipboard.h + GuiCommandBuffer.h + GuiCommandEdit.h + GuiDelimiterDialog.h + GuiDialogView.h + GuiDocument.h + GuiErrorList.h + GuiERT.h + GuiExternal.h + GuiFloatDialog.h + GuiFloat.h + GuiFontExample.h GuiFontLoader.h + GuiGraphicsDialog.h + GuiGraphics.h + GuiGraphicsUi.h + GuiImage.h GuiImplementation.h + GuiInclude.h + GuiIndex.h + GuiKeySymbol.h + GuiListings.h + GuiLog.h + GuiMathMatrixDialog.h + GuiMenubar.h + GuiNomencl.h + GuiNote.h + GuiPainter.h + GuiParagraph.h + GuiPopupMenu.h + GuiPrefs.h + GuiPrintDialog.h + GuiPrint.h + GuiRef.h + GuiSearch.h GuiSelection.h + GuiSelectionManager.h + GuiSendto.h + GuiSetBorder.h + GuiShowFile.h + GuiSpellchecker.h + GuiTabularCreate.h + GuiTabular.h + GuiTexinfo.h + GuiThesaurus.h + GuiToc.h + GuiToolbar.h + GuiURLDialog.h GuiView.h + GuiViewSource.h + GuiVSpace.h GuiWorkArea.h + GuiWrap.h IconPalette.h InsertTableWidget.h LengthCombo.h LyXFileDialog.h PanelStack.h - QAbout.h - QBibitem.h - QBibtex.h - QBox.h - QBranch.h - QBranches.h - QChanges.h - QCharacter.h - QCharacter.h - QCitation.h - QCitationDialog.h - QCommandBuffer.h - QCommandEdit.h - QDelimiterDialog.h - QDialogView.h - QDocument.h - QERT.h - QErrorList.h - QExternal.h - QFloat.h - QFloatDialog.h - QFontExample.h - QGraphics.h - QGraphicsDialog.h - QGraphicsUi.h - QInclude.h - QIndex.h - QKeySymbol.h - QListings.h - QLImage.h - QLMenubar.h - QLPainter.h - QLPopupMenu.h - QLPrintDialog.h - QLToolbar.h - QLog.h - QMathMatrixDialog.h - QNomencl.h - QNote.h - QParagraph.h - QPrefs.h - QPrint.h - QRef.h - QSearch.h - QSelectionManager.h - QSendto.h - QSetBorder.h - QShowFile.h - QSpellchecker.h - QTabular.h - QTabularCreate.h - QTexinfo.h - QThesaurus.h - QToc.h - QURLDialog.h - QVSpace.h - QViewSource.h - QWrap.h Qt2BC.h TocModel.h TocWidget.h @@ -937,76 +937,76 @@ src_frontends_qt4_files = Split(''' EmptyTable.cpp FileDialog.cpp FloatPlacement.cpp + GuiAbout.cpp GuiApplication.cpp + GuiBibitem.cpp + GuiBibtex.cpp + GuiBox.cpp + GuiBranch.cpp + GuiBranches.cpp + GuiChanges.cpp + GuiCharacter.cpp + GuiCitation.cpp + GuiCitationDialog.cpp GuiClipboard.cpp + GuiCommandBuffer.cpp + GuiCommandEdit.cpp + GuiDelimiterDialog.cpp + GuiDialogView.cpp + GuiDocument.cpp + GuiErrorList.cpp + GuiERT.cpp + GuiExternal.cpp + GuiFloat.cpp + GuiFloatDialog.cpp + GuiFontExample.cpp GuiFontLoader.cpp GuiFontMetrics.cpp + GuiGraphics.cpp + GuiGraphicsDialog.cpp + GuiImage.cpp GuiImplementation.cpp + GuiInclude.cpp + GuiIndex.cpp + GuiKeySymbol.cpp + GuiListings.cpp + GuiLog.cpp + GuiMathMatrixDialog.cpp + GuiMenubar.cpp + GuiNomencl.cpp + GuiNote.cpp + GuiPainter.cpp + GuiParagraph.cpp + GuiPopupMenu.cpp + GuiPrefs.cpp + GuiPrint.cpp + GuiPrintDialog.cpp + GuiRef.cpp + GuiSearch.cpp GuiSelection.cpp + GuiSelectionManager.cpp + GuiSendto.cpp + GuiSetBorder.cpp + GuiShowFile.cpp + GuiSpellchecker.cpp + GuiTabular.cpp + GuiTabularCreate.cpp + GuiTexinfo.cpp + GuiThesaurus.cpp + GuiToc.cpp + GuiToolbar.cpp + GuiURLDialog.cpp GuiView.cpp + GuiViewSource.cpp + GuiVSpace.cpp GuiWorkArea.cpp + GuiWrap.cpp IconPalette.cpp InsertTableWidget.cpp KeySymbol.cpp LengthCombo.cpp LyXFileDialog.cpp PanelStack.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 - QFontExample.cpp - QGraphics.cpp - QGraphicsDialog.cpp - QInclude.cpp - QIndex.cpp - QKeySymbol.cpp - QListings.cpp - QLImage.cpp - QLMenubar.cpp - QLPainter.cpp - QLPopupMenu.cpp - QLPrintDialog.cpp - QLToolbar.cpp - QLog.cpp - QMathMatrixDialog.cpp - QNomencl.cpp - QNote.cpp - QParagraph.cpp - QPrefs.cpp - QPrint.cpp - QRef.cpp - QSearch.cpp - QSelectionManager.cpp - QSendto.cpp - QSetBorder.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 diff --git a/src/frontends/qt4/Action.cpp b/src/frontends/qt4/Action.cpp index 2cbe3d8e58..26d9bd6ec3 100644 --- a/src/frontends/qt4/Action.cpp +++ b/src/frontends/qt4/Action.cpp @@ -31,7 +31,7 @@ namespace lyx { namespace frontend { -Action::Action(GuiView & lyxView, docstring const & text, +Action::Action(GuiViewBase & lyxView, docstring const & text, FuncRequest const & func, docstring const & tooltip) : QAction(&lyxView), func_(func), lyxView_(lyxView) { @@ -46,7 +46,7 @@ Action::Action(GuiView & lyxView, docstring const & text, update(); } -Action::Action(GuiView & lyxView, string const & icon, docstring const & text, +Action::Action(GuiViewBase & lyxView, string const & icon, docstring const & text, FuncRequest const & func, docstring const & tooltip) : QAction(&lyxView), func_(func), lyxView_(lyxView) { diff --git a/src/frontends/qt4/Action.h b/src/frontends/qt4/Action.h index 090ece3e4e..79bf2b5ff0 100644 --- a/src/frontends/qt4/Action.h +++ b/src/frontends/qt4/Action.h @@ -22,7 +22,7 @@ namespace lyx { namespace frontend { -class GuiView; +class GuiViewBase; /** * Action - Qt interface with LyX' FuncRequest. @@ -33,10 +33,10 @@ class Action : public QAction { Q_OBJECT public: - Action(GuiView & lyxView, docstring const & text, + Action(GuiViewBase & lyxView, docstring const & text, FuncRequest const & func, docstring const & tooltip = docstring()); - Action(GuiView & lyxView, std::string const & icon, docstring const & text, + Action(GuiViewBase & lyxView, std::string const & icon, docstring const & text, FuncRequest const & func, docstring const & tooltip = docstring()); void update(); @@ -52,7 +52,7 @@ private Q_SLOTS: private: FuncRequest const & func_ ; - GuiView & lyxView_; + GuiViewBase & lyxView_; }; diff --git a/src/frontends/qt4/ChangeLog b/src/frontends/qt4/ChangeLog index 534eb13f0b..1382803c46 100644 --- a/src/frontends/qt4/ChangeLog +++ b/src/frontends/qt4/ChangeLog @@ -413,8 +413,8 @@ * QGraphicsDialog.C (c-tor): add a PathValidator of the filename widget. - * QInclude.C (build_dialog, update_contents): - * QIncludeDialog.C (c-tor): add a PathValidator of the filenameED + * GuiInclude.C (build_dialog, update_contents): + * GuiIncludeDialog.C (c-tor): add a PathValidator of the filenameED widget. 2005-05-09 Michael Schmitt @@ -925,7 +925,7 @@ 2004-07-24 Lars Gullik Bjønnes * QPrefs.C, QMathMatrixDialog.C: - * QLog.C, QAbout.C: change "support/std_sstream.h" to + * GuiLog.C, QAbout.C: change "support/std_sstream.h" to 2004-07-22 Lars Gullik Bjønnes @@ -1290,7 +1290,7 @@ * QExternalDialog.C (browseClicked): * QGraphicsDialog.C (browse_clicked): - * QInclude.C (browse): + * GuiInclude.C (browse): changes doe to the name change controller().Browse() to controller().browse(). @@ -1394,7 +1394,7 @@ 2003-12-05 Angus Leeming - * QLog.C: much simplified, thanks to the more powerful interface + * GuiLog.C: much simplified, thanks to the more powerful interface of ControlLog. * Dialogs.C: no need anymore to build a separate VCLog dialog. @@ -1643,12 +1643,12 @@ 2003-09-19 Angus Leeming - * QInclude.C: changes dues to the changed storage in InsetInclude, + * GuiInclude.C: changes dues to the changed storage in InsetInclude, from an InsetInclude::params to an InsetCommandParams. 2003-09-18 Angus Leeming - * QInclude.C (apply): No need to set InsetInclude::Params::flag; + * GuiInclude.C (apply): No need to set InsetInclude::Params::flag; the variable has been removed. Instead, set the command name directly. 2003-09-18 Angus Leeming @@ -1719,7 +1719,7 @@ * QGraphics.C: * QLMenubar.C: * QLPopupMenu.C: - * QLog.C: + * GuiLog.C: * QMathDialog.C: * QParagraphDialog.C: * QPrefsDialog.C: @@ -2173,8 +2173,8 @@ * QExternal.C: * QFloat.C: * QGraphics.C: - * QInclude.C: - * QLog.C: + * GuiInclude.C: + * GuiLog.C: * QMinipage.C: * QParagraph.C: * QRef.C: @@ -2371,7 +2371,7 @@ 2003-04-07 John Levon - * ui/QIncludeDialogBase.ui: make "Show preview" + * ui/GuiIncludeDialogBase.ui: make "Show preview" call change_adaptor() 2003-04-07 John Levon @@ -2591,7 +2591,7 @@ * Dialogs3.C: add these dialogs. - * QLog.[Ch]: + * GuiLog.[Ch]: * QShowFile.[Ch]: * QVCLog.[Ch]: changes to use the new Dialog-based scheme. @@ -2788,7 +2788,7 @@ 2003-03-05 Angus Leeming - * QInclude.[Ch]: changes to use the new Dialog-based scheme. + * GuiInclude.[Ch]: changes to use the new Dialog-based scheme. * Dialogs.C: * Dialogs2.C: @@ -3015,7 +3015,7 @@ * QDocument.C: rename "Xxxskip" to "XxxSkip" * QGraphicsDialog.C: - * QLog.C: Make output messages identical to other messages + * GuiLog.C: Make output messages identical to other messages * ui/*.ui: In strings, remove space in front of colon ("... :" => "...:") for harmonization with xforms labels @@ -3311,12 +3311,12 @@ 2002-12-03 John Levon - * QIncludeDialog.C: another fix + * GuiIncludeDialog.C: another fix 2002-12-03 John Levon - * ui/QIncludeDialog.ui: - * QInclude.C: support preview() + * ui/GuiIncludeDialog.ui: + * GuiInclude.C: support preview() 2002-12-01 Lars Gullik Bjønnes @@ -3683,8 +3683,8 @@ 2002-11-07 John Levon - * ui/QIncludeDialog.ui: - * QInclude.C: fix setting of combobox + * ui/GuiIncludeDialog.ui: + * GuiInclude.C: fix setting of combobox 2002-11-07 John Levon @@ -3840,7 +3840,7 @@ * QLyXKeySym.C (operator=): out of class version. - * QLog.C (update_contents): use a simpler and faster way to fill + * GuiLog.C (update_contents): use a simpler and faster way to fill the log dialog. * QLPopupMenu.C (getLabel): use subst directly on mi.label() @@ -3849,7 +3849,7 @@ (lines): put int i inside for scope (fillPolygon): put j insize for scope - * QInclude.C (update_contents): local ref to params + * GuiInclude.C (update_contents): local ref to params (apply): ditto * QGraphics.C (update_contents): initialize item to 0 @@ -4196,8 +4196,8 @@ * QExternalDialog.C: * QGraphicsDialog.h: * QGraphicsDialog.C: - * QIncludeDialog.h: - * QIncludeDialog.C: + * GuiIncludeDialog.h: + * GuiIncludeDialog.C: * QIndexDialog.h: * QIndexDialog.C: * QSearchDialog.h: @@ -4229,9 +4229,9 @@ 2002-09-10 John Levon - * ui/QIncludeDialog.ui: - * QInclude.h: - * QInclude.C: remove don't typeset + * ui/GuiIncludeDialog.ui: + * GuiInclude.h: + * GuiInclude.C: remove don't typeset * Dialogs2.C: add empty showWrap @@ -4251,7 +4251,7 @@ * iconpalette.C (resizeEvent): compile fix. - * QInclude.C (update_contents): remove lyxerr call. + * GuiInclude.C (update_contents): remove lyxerr call. 2002-09-08 John Levon @@ -4372,7 +4372,7 @@ 2002-08-29 John Levon - * QInclude.C: remove some wrong code removed from xforms + * GuiInclude.C: remove some wrong code removed from xforms 2002-08-29 John Levon @@ -4486,9 +4486,9 @@ * QExternal.[Ch]: * QFloat.[Ch]: * QGraphics.[Ch]: - * QInclude.[Ch]: + * GuiInclude.[Ch]: * QIndex.[Ch]: - * QLog.[Ch]: + * GuiLog.[Ch]: * QMinipage.[Ch]: * QParagraph.[Ch]: * QPreamble.[Ch]: @@ -4677,8 +4677,8 @@ * ui/QRefDialog.ui: document combo * QRef.C: idem - * QInclude.C: new layout - * ui/QIncludeDialog.ui: new layout + * GuiInclude.C: new layout + * ui/GuiIncludeDialog.ui: new layout * ui/QCitationDialog.ui: new layout @@ -5311,7 +5311,7 @@ 2001-08-31 Edwin Leuven * ui/QGraphicsDialog.ui : minor layout tweak - * ui/QIncludeDialog.ui : idem + * ui/GuiIncludeDialog.ui : idem * ui/QMinipageDialog.ui: idem * ui/QURLDialog.ui: idem @@ -5361,7 +5361,7 @@ was failing with "incomplete type is not allowed" in instantiation of boost::scoped_ptr dialog_. - * QLog.C: added a couple of using std::xyz directives. + * GuiLog.C: added a couple of using std::xyz directives. * QPreambleDialog.C: added a using std::getline directive. @@ -5400,9 +5400,9 @@ 2001-08-29 John Levon - * QLog.[Ch]: - * QLogDialog.[Ch]: - * ui/QLogDialog.ui: + * GuiLog.[Ch]: + * GuiLogDialog.[Ch]: + * ui/GuiLogDialog.ui: * QVCLog.[Ch]: * QVCLogDialog.[Ch]: * ui/QVCLogDialog.ui: @@ -5437,7 +5437,7 @@ * QThesaurus.C: clear selection on update - * QInclude.[Ch]: + * GuiInclude.[Ch]: * QincludeDialog.[Ch]: * ui/QincludeDialog.ui: * Makefile.am: diff --git a/src/frontends/qt4/Dialogs.cpp b/src/frontends/qt4/Dialogs.cpp index c82d891e05..05b83869b2 100644 --- a/src/frontends/qt4/Dialogs.cpp +++ b/src/frontends/qt4/Dialogs.cpp @@ -47,50 +47,50 @@ #include "ButtonController.h" #include "DockView.h" #include "GuiView.h" -#include "QAbout.h" -#include "QBibitem.h" -#include "QBibtex.h" -#include "QBox.h" -#include "QBranch.h" -#include "QChanges.h" -#include "QCharacter.h" -#include "QCitation.h" -#include "QCitationDialog.h" -#include "QDelimiterDialog.h" -#include "QDocument.h" -#include "QErrorList.h" -#include "QERT.h" -#include "QExternal.h" -#include "QFloat.h" -#include "QGraphics.h" -#include "QInclude.h" -#include "QIndex.h" -#include "QMathMatrixDialog.h" -#include "QNomencl.h" -#include "QListings.h" -#include "QLog.h" -#include "QViewSource.h" -#include "QNote.h" -#include "QParagraph.h" -#include "QPrefs.h" -#include "QPrint.h" -#include "QRef.h" -#include "QSearch.h" -#include "QSendto.h" -#include "QShowFile.h" -#include "QSpellchecker.h" -#include "QTabular.h" -#include "QTabularCreate.h" -#include "QTexinfo.h" -#include "QToc.h" +#include "GuiAbout.h" +#include "GuiBibitem.h" +#include "GuiBibtex.h" +#include "GuiBox.h" +#include "GuiBranch.h" +#include "GuiChanges.h" +#include "GuiCharacter.h" +#include "GuiCitation.h" +#include "GuiCitationDialog.h" +#include "GuiDelimiterDialog.h" +#include "GuiDocument.h" +#include "GuiErrorList.h" +#include "GuiERT.h" +#include "GuiExternal.h" +#include "GuiFloat.h" +#include "GuiGraphics.h" +#include "GuiInclude.h" +#include "GuiIndex.h" +#include "GuiMathMatrixDialog.h" +#include "GuiNomencl.h" +#include "GuiListings.h" +#include "GuiLog.h" +#include "GuiViewSource.h" +#include "GuiNote.h" +#include "GuiParagraph.h" +#include "GuiPrefs.h" +#include "GuiPrint.h" +#include "GuiRef.h" +#include "GuiSearch.h" +#include "GuiSendto.h" +#include "GuiShowFile.h" +#include "GuiSpellchecker.h" +#include "GuiTabular.h" +#include "GuiTabularCreate.h" +#include "GuiTexinfo.h" +#include "GuiToc.h" #include "TocWidget.h" #include "UrlView.h" -#include "QVSpace.h" -#include "QWrap.h" +#include "GuiVSpace.h" +#include "GuiWrap.h" #ifdef HAVE_LIBAIKSAURUS #include "ControlThesaurus.h" -#include "QThesaurus.h" +#include "GuiThesaurus.h" #endif #include "qt_helpers.h" @@ -150,165 +150,165 @@ Dialogs::DialogPtr Dialogs::build(string const & name) if (name == "aboutlyx") { dialog->setController(new ControlAboutlyx(*dialog)); - dialog->setView(new QAbout(*dialog)); + dialog->setView(new GuiAbout(*dialog)); dialog->bc().bp(new OkCancelPolicy); } else if (name == "bibitem") { dialog->setController(new ControlCommand(*dialog, name, name)); - dialog->setView(new QBibitem(*dialog)); + dialog->setView(new GuiBibitem(*dialog)); dialog->bc().bp(new OkCancelReadOnlyPolicy); } else if (name == "bibtex") { dialog->setController(new ControlBibtex(*dialog)); - dialog->setView(new QBibtex(*dialog)); + dialog->setView(new GuiBibtex(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "box") { dialog->setController(new ControlBox(*dialog)); - dialog->setView(new QBox(*dialog)); + dialog->setView(new GuiBox(*dialog)); dialog->bc().bp(new OkApplyCancelReadOnlyPolicy); } else if (name == "branch") { dialog->setController(new ControlBranch(*dialog)); - dialog->setView(new QBranch(*dialog)); + dialog->setView(new GuiBranch(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "changes") { dialog->setController(new ControlChanges(*dialog)); - dialog->setView(new QChanges(*dialog)); + dialog->setView(new GuiChanges(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "character") { dialog->setController(new ControlCharacter(*dialog)); - dialog->setView(new QCharacter(*dialog)); + dialog->setView(new GuiCharacter(*dialog)); dialog->bc().bp(new OkApplyCancelReadOnlyPolicy); } else if (name == "citation") { - QCitation * ci = new QCitation(*dialog); + GuiCitation * ci = new GuiCitation(*dialog); dialog->setController(ci); - dialog->setView(new QCitationDialog(*dialog, ci)); + dialog->setView(new GuiCitationDialog(*dialog, ci)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "document") { dialog->setController(new ControlDocument(*dialog)); - dialog->setView(new QDocument(*dialog)); + dialog->setView(new GuiDocument(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "errorlist") { dialog->setController(new ControlErrorList(*dialog)); - dialog->setView(new QErrorList(*dialog)); + dialog->setView(new GuiErrorList(*dialog)); dialog->bc().bp(new OkCancelPolicy); } else if (name == "ert") { dialog->setController(new ControlERT(*dialog)); - dialog->setView(new QERT(*dialog)); + dialog->setView(new GuiERT(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "external") { dialog->setController(new ControlExternal(*dialog)); - dialog->setView(new QExternal(*dialog)); + dialog->setView(new GuiExternal(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "file") { dialog->setController(new ControlShowFile(*dialog)); - dialog->setView(new QShowFile(*dialog)); + dialog->setView(new GuiShowFile(*dialog)); dialog->bc().bp(new OkCancelPolicy); } else if (name == "findreplace") { dialog->setController(new ControlSearch(*dialog)); - dialog->setView(new QSearch(*dialog)); + dialog->setView(new GuiSearch(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "float") { dialog->setController(new ControlFloat(*dialog)); - dialog->setView(new QFloat(*dialog)); + dialog->setView(new GuiFloat(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "graphics") { dialog->setController(new ControlGraphics(*dialog)); - dialog->setView(new QGraphics(*dialog)); + dialog->setView(new GuiGraphics(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "include") { dialog->setController(new ControlInclude(*dialog)); - dialog->setView(new QInclude(*dialog)); + dialog->setView(new GuiInclude(*dialog)); dialog->bc().bp(new OkApplyCancelReadOnlyPolicy); } else if (name == "index") { dialog->setController(new ControlCommand(*dialog, name, name)); - dialog->setView(new QIndex(*dialog, + dialog->setView(new GuiIndex(*dialog, _("Index Entry"), qt_("&Keyword:"))); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "nomenclature") { dialog->setController(new ControlCommand(*dialog, name, name)); - dialog->setView(new QNomencl(*dialog, _("Nomenclature Entry"))); + dialog->setView(new GuiNomencl(*dialog, _("Nomenclature Entry"))); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "label") { dialog->setController(new ControlCommand(*dialog, name, name)); - dialog->setView(new QIndex(*dialog, + dialog->setView(new GuiIndex(*dialog, _("Label"), qt_("&Label:"))); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "log") { dialog->setController(new ControlLog(*dialog)); - dialog->setView(new QLog(*dialog)); + dialog->setView(new GuiLog(*dialog)); dialog->bc().bp(new OkCancelPolicy); } else if (name == "view-source") { - QViewSource * qvs = new QViewSource(*dialog); + GuiViewSource * qvs = new GuiViewSource(*dialog); dialog->setController(qvs); - GuiView & gui_view = static_cast(lyxview_); - dialog->setView(new DockView( + GuiViewBase & gui_view = static_cast(lyxview_); + dialog->setView(new DockView( *dialog, qvs, &gui_view, _("LaTeX Source"), Qt::BottomDockWidgetArea)); dialog->bc().bp(new OkCancelPolicy); } else if (name == "mathdelimiter") { dialog->setController(new ControlMath(*dialog)); - dialog->setView(new QMathDelimiter(*dialog)); + dialog->setView(new GuiMathDelimiter(*dialog)); dialog->bc().bp(new IgnorantPolicy); } else if (name == "mathmatrix") { dialog->setController(new ControlMath(*dialog)); - dialog->setView(new QMathMatrix(*dialog)); + dialog->setView(new GuiMathMatrix(*dialog)); dialog->bc().bp(new IgnorantPolicy); } else if (name == "note") { dialog->setController(new ControlNote(*dialog)); - dialog->setView(new QNote(*dialog)); + dialog->setView(new GuiNote(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "paragraph") { dialog->setController(new ControlParagraph(*dialog)); - dialog->setView(new QParagraph(*dialog)); + dialog->setView(new GuiParagraph(*dialog)); dialog->bc().bp(new OkApplyCancelReadOnlyPolicy); } else if (name == "prefs") { dialog->setController(new ControlPrefs(*dialog)); - dialog->setView(new QPrefs(*dialog)); + dialog->setView(new GuiPrefs(*dialog)); dialog->bc().bp(new PreferencesPolicy); } else if (name == "print") { dialog->setController(new ControlPrint(*dialog)); - dialog->setView(new QPrint(*dialog)); + dialog->setView(new GuiPrint(*dialog)); dialog->bc().bp(new OkApplyCancelPolicy); } else if (name == "ref") { // full qualification because qt4 has also a ControlRef type dialog->setController(new ControlRef(*dialog)); - dialog->setView(new QRef(*dialog)); + dialog->setView(new GuiRef(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "sendto") { dialog->setController(new ControlSendto(*dialog)); - dialog->setView(new QSendto(*dialog)); + dialog->setView(new GuiSendto(*dialog)); dialog->bc().bp(new OkApplyCancelPolicy); } else if (name == "spellchecker") { dialog->setController(new ControlSpellchecker(*dialog)); - dialog->setView(new QSpellchecker(*dialog)); + dialog->setView(new GuiSpellchecker(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "tabular") { dialog->setController(new ControlTabular(*dialog)); - dialog->setView(new QTabular(*dialog)); + dialog->setView(new GuiTabular(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "tabularcreate") { dialog->setController(new ControlTabularCreate(*dialog)); - dialog->setView(new QTabularCreate(*dialog)); + dialog->setView(new GuiTabularCreate(*dialog)); dialog->bc().bp(new IgnorantPolicy); } else if (name == "texinfo") { dialog->setController(new ControlTexinfo(*dialog)); - dialog->setView(new QTexinfo(*dialog)); + dialog->setView(new GuiTexinfo(*dialog)); dialog->bc().bp(new OkCancelPolicy); #ifdef HAVE_LIBAIKSAURUS } else if (name == "thesaurus") { dialog->setController(new ControlThesaurus(*dialog)); - dialog->setView(new QThesaurus(*dialog)); + dialog->setView(new GuiThesaurus(*dialog)); dialog->bc().bp(new OkApplyCancelReadOnlyPolicy); #endif } else if (name == "toc") { - GuiView & gui_view = static_cast(lyxview_); - QToc * qtoc = new QToc(*dialog, &gui_view); + GuiViewBase & gui_view = static_cast(lyxview_); + GuiToc * qtoc = new GuiToc(*dialog, &gui_view); dialog->setController(qtoc); #ifdef Q_WS_MACX // On Mac show as a drawer at the right - dialog->setView(new DockView( + dialog->setView(new DockView( *dialog, qtoc, &gui_view, _("Outline"), Qt::RightDockWidgetArea, Qt::Drawer)); #else - dialog->setView(new DockView( + dialog->setView(new DockView( *dialog, qtoc, &gui_view, _("Outline"))); #endif dialog->bc().bp(new OkCancelPolicy); @@ -318,15 +318,15 @@ Dialogs::DialogPtr Dialogs::build(string const & name) dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "vspace") { dialog->setController(new ControlVSpace(*dialog)); - dialog->setView(new QVSpace(*dialog)); + dialog->setView(new GuiVSpace(*dialog)); dialog->bc().bp(new OkApplyCancelReadOnlyPolicy); } else if (name == "wrap") { dialog->setController(new ControlWrap(*dialog)); - dialog->setView(new QWrap(*dialog)); + dialog->setView(new GuiWrap(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } else if (name == "listings") { dialog->setController(new ControlListings(*dialog)); - dialog->setView(new QListings(*dialog)); + dialog->setView(new GuiListings(*dialog)); dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy); } diff --git a/src/frontends/qt4/QAbout.cpp b/src/frontends/qt4/GuiAbout.cpp similarity index 91% rename from src/frontends/qt4/QAbout.cpp rename to src/frontends/qt4/GuiAbout.cpp index 05901ec997..0ed3de0a96 100644 --- a/src/frontends/qt4/QAbout.cpp +++ b/src/frontends/qt4/GuiAbout.cpp @@ -1,5 +1,5 @@ /** - * \file QAbout.cpp + * \file GuiAbout.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QAbout.h" +#include "GuiAbout.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -38,17 +38,17 @@ namespace lyx { namespace frontend { -typedef QController > AboutBase; +typedef QController > AboutBase; -QAbout::QAbout(Dialog & parent) +GuiAbout::GuiAbout(Dialog & parent) : AboutBase(parent, _("About LyX")) { } -void QAbout::build_dialog() +void GuiAbout::build_dialog() { - dialog_.reset(new QAboutDialog); + dialog_.reset(new GuiAboutDialog); connect(dialog_.get()->closePB, SIGNAL(clicked()), this, SLOT(slotClose())); @@ -121,4 +121,4 @@ void QAbout::build_dialog() } // namespace frontend } // namespace lyx -#include "QAbout_moc.cpp" +#include "GuiAbout_moc.cpp" diff --git a/src/frontends/qt4/QAbout.h b/src/frontends/qt4/GuiAbout.h similarity index 74% rename from src/frontends/qt4/QAbout.h rename to src/frontends/qt4/GuiAbout.h index 92d01e992c..f38985a017 100644 --- a/src/frontends/qt4/QAbout.h +++ b/src/frontends/qt4/GuiAbout.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QAbout.h + * \file GuiAbout.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef FORMABOUT_H #define FORMABOUT_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_AboutUi.h" #include @@ -21,10 +21,10 @@ namespace frontend { class ControlAboutlyx; -class QAboutDialog : public QDialog, public Ui::QAboutUi { +class GuiAboutDialog : public QDialog, public Ui::AboutUi { Q_OBJECT public: - QAboutDialog(QWidget * parent = 0) + GuiAboutDialog(QWidget * parent = 0) : QDialog(parent) { setupUi(this); @@ -33,11 +33,11 @@ public: }; -class QAbout - : public QController > +class GuiAbout + : public QController > { public: - QAbout(Dialog &); + GuiAbout(Dialog &); private: /// not needed virtual void apply() {} diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index a4a9df859f..f830c26ae2 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -15,7 +15,7 @@ #include "GuiApplication.h" #include "qt_helpers.h" -#include "QLImage.h" +#include "GuiImage.h" #include "socket_callback.h" #include "frontends/LyXView.h" diff --git a/src/frontends/qt4/QBibitem.cpp b/src/frontends/qt4/GuiBibitem.cpp similarity index 77% rename from src/frontends/qt4/QBibitem.cpp rename to src/frontends/qt4/GuiBibitem.cpp index 6e29d582d0..a54542614c 100644 --- a/src/frontends/qt4/QBibitem.cpp +++ b/src/frontends/qt4/GuiBibitem.cpp @@ -1,5 +1,5 @@ /** - * \file QBibitem.cpp + * \file GuiBibitem.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QBibitem.h" +#include "GuiBibitem.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -29,7 +29,7 @@ namespace frontend { // ///////////////////////////////////////////////////////////////////// -QBibitemDialog::QBibitemDialog(QBibitem * form) +GuiBibitemDialog::GuiBibitemDialog(GuiBibitem * form) : form_(form) { setupUi(this); @@ -43,13 +43,13 @@ QBibitemDialog::QBibitemDialog(QBibitem * form) } -void QBibitemDialog::change_adaptor() +void GuiBibitemDialog::change_adaptor() { form_->changed(); } -void QBibitemDialog::closeEvent(QCloseEvent *e) +void GuiBibitemDialog::closeEvent(QCloseEvent *e) { form_->slotWMHide(); e->accept(); @@ -62,18 +62,18 @@ void QBibitemDialog::closeEvent(QCloseEvent *e) // ///////////////////////////////////////////////////////////////////// -typedef QController > BibItemBase; +typedef QController > BibItemBase; -QBibitem::QBibitem(Dialog & parent) +GuiBibitem::GuiBibitem(Dialog & parent) : BibItemBase(parent, _("Bibliography Entry Settings")) { } -void QBibitem::build_dialog() +void GuiBibitem::build_dialog() { - dialog_.reset(new QBibitemDialog(this)); + dialog_.reset(new GuiBibitemDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); @@ -82,21 +82,21 @@ void QBibitem::build_dialog() } -void QBibitem::update_contents() +void GuiBibitem::update_contents() { dialog_->keyED->setText(toqstr(controller().params()["key"])); dialog_->labelED->setText(toqstr(controller().params()["label"])); } -void QBibitem::apply() +void GuiBibitem::apply() { controller().params()["key"] = qstring_to_ucs4(dialog_->keyED->text()); controller().params()["label"] = qstring_to_ucs4(dialog_->labelED->text()); } -bool QBibitem::isValid() +bool GuiBibitem::isValid() { return !dialog_->keyED->text().isEmpty(); } @@ -104,4 +104,4 @@ bool QBibitem::isValid() } // namespace frontend } // namespace lyx -#include "QBibitem_moc.cpp" +#include "GuiBibitem_moc.cpp" diff --git a/src/frontends/qt4/QBibitem.h b/src/frontends/qt4/GuiBibitem.h similarity index 71% rename from src/frontends/qt4/QBibitem.h rename to src/frontends/qt4/GuiBibitem.h index 0cfa8493ab..9c7bac9179 100644 --- a/src/frontends/qt4/QBibitem.h +++ b/src/frontends/qt4/GuiBibitem.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QBibitem.h + * \file GuiBibitem.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QBIBITEM_CONTROLLER_H #define QBIBITEM_CONTROLLER_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_BibitemUi.h" @@ -23,31 +23,31 @@ namespace lyx { namespace frontend { -class QBibitem; +class GuiBibitem; -class QBibitemDialog : public QDialog, public Ui::QBibitemUi { +class GuiBibitemDialog : public QDialog, public Ui::BibitemUi { Q_OBJECT public: - QBibitemDialog(QBibitem * form); + GuiBibitemDialog(GuiBibitem * form); protected Q_SLOTS: virtual void change_adaptor(); protected: virtual void closeEvent(QCloseEvent * e); private: - QBibitem * form_; + GuiBibitem * form_; }; class ControlCommand; -class QBibitem - : public QController > +class GuiBibitem + : public QController > { public: - friend class QBibitemDialog; + friend class GuiBibitemDialog; - QBibitem(Dialog &); + GuiBibitem(Dialog &); protected: virtual bool isValid(); diff --git a/src/frontends/qt4/QBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp similarity index 88% rename from src/frontends/qt4/QBibtex.cpp rename to src/frontends/qt4/GuiBibtex.cpp index bea39e6372..f1ad85b11f 100644 --- a/src/frontends/qt4/QBibtex.cpp +++ b/src/frontends/qt4/GuiBibtex.cpp @@ -1,5 +1,5 @@ /** - * \file QBibtex.cpp + * \file GuiBibtex.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "QBibtex.h" +#include "GuiBibtex.h" #include "ui_BibtexAddUi.h" #include "Qt2BC.h" @@ -53,11 +53,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QBibtexDialog +// GuiBibtexDialog // ///////////////////////////////////////////////////////////////////// -QBibtexDialog::QBibtexDialog(QBibtex * form) +GuiBibtexDialog::GuiBibtexDialog(GuiBibtex * form) : form_(form) { setupUi(this); @@ -68,21 +68,21 @@ QBibtexDialog::QBibtexDialog(QBibtex * form) connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose())); connect(stylePB, SIGNAL(clicked()), - this, SLOT( browsePressed())); + this, SLOT(browsePressed())); connect(deletePB, SIGNAL(clicked()), - this, SLOT( deletePressed())); + this, SLOT(deletePressed())); connect(styleCB, SIGNAL(editTextChanged (const QString &)), - this, SLOT( change_adaptor())); + this, SLOT(change_adaptor())); connect(databaseLW, SIGNAL(itemSelectionChanged()), - this, SLOT( databaseChanged())); + this, SLOT(databaseChanged())); connect(bibtocCB, SIGNAL(clicked()), - this, SLOT( change_adaptor())); + this, SLOT(change_adaptor())); connect(btPrintCO, SIGNAL(activated(int)), - this, SLOT( change_adaptor())); + this, SLOT(change_adaptor())); connect(addBibPB, SIGNAL(clicked()), - this, SLOT( addPressed())); + this, SLOT(addPressed())); - add_ = new UiDialog(this, true); + add_ = new UiDialog(this, true); Qt2BC * bcview = new Qt2BC(add_bc_); add_bc_.view(bcview); @@ -113,7 +113,7 @@ QBibtexDialog::QBibtexDialog(QBibtex * form) } -void QBibtexDialog::bibEDChanged() +void GuiBibtexDialog::bibEDChanged() { // Indicate to the button controller that the contents have // changed. The actual test of validity is carried out by @@ -122,13 +122,13 @@ void QBibtexDialog::bibEDChanged() } -void QBibtexDialog::change_adaptor() +void GuiBibtexDialog::change_adaptor() { form_->changed(); } -void QBibtexDialog::browsePressed() +void GuiBibtexDialog::browsePressed() { docstring const file = form_->controller().browseBst(docstring()); @@ -154,7 +154,7 @@ void QBibtexDialog::browsePressed() } -void QBibtexDialog::browseBibPressed() +void GuiBibtexDialog::browseBibPressed() { docstring const file = trim(form_->controller().browseBib(docstring())); @@ -178,14 +178,14 @@ void QBibtexDialog::browseBibPressed() } -void QBibtexDialog::addPressed() +void GuiBibtexDialog::addPressed() { add_bc_.valid(false); add_->exec(); } -void QBibtexDialog::addDatabase() +void GuiBibtexDialog::addDatabase() { int const sel = add_->bibLW->currentRow(); docstring const file = trim(qstring_to_ucs4(add_->bibED->text())); @@ -219,7 +219,7 @@ void QBibtexDialog::addDatabase() } -void QBibtexDialog::deletePressed() +void GuiBibtexDialog::deletePressed() { databaseLW->takeItem(databaseLW->currentRow()); form_->changed(); @@ -227,19 +227,19 @@ void QBibtexDialog::deletePressed() -void QBibtexDialog::databaseChanged() +void GuiBibtexDialog::databaseChanged() { deletePB->setEnabled(!form_->readOnly() && databaseLW->currentRow() != -1); } -void QBibtexDialog::availableChanged() +void GuiBibtexDialog::availableChanged() { add_bc_.valid(true); } -void QBibtexDialog::closeEvent(QCloseEvent *e) +void GuiBibtexDialog::closeEvent(QCloseEvent *e) { form_->slotWMHide(); e->accept(); @@ -253,17 +253,17 @@ void QBibtexDialog::closeEvent(QCloseEvent *e) ///////////////////////////////////////////////////////////////////// -typedef QController > BibtexBase; +typedef QController > BibtexBase; -QBibtex::QBibtex(Dialog & parent) +GuiBibtex::GuiBibtex(Dialog & parent) : BibtexBase(parent, _("BibTeX Bibliography")) { } -void QBibtex::build_dialog() +void GuiBibtex::build_dialog() { - dialog_.reset(new QBibtexDialog(this)); + dialog_.reset(new GuiBibtexDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); @@ -276,7 +276,7 @@ void QBibtex::build_dialog() } -void QBibtex::update_contents() +void GuiBibtex::update_contents() { bool bibtopic = controller().usingBibtopic(); @@ -343,7 +343,7 @@ void QBibtex::update_contents() } -void QBibtex::apply() +void GuiBibtex::apply() { docstring dbs(qstring_to_ucs4(dialog_->databaseLW->item(0)->text())); @@ -394,7 +394,7 @@ void QBibtex::apply() } -bool QBibtex::isValid() +bool GuiBibtex::isValid() { return dialog_->databaseLW->count() != 0; } @@ -402,4 +402,4 @@ bool QBibtex::isValid() } // namespace frontend } // namespace lyx -#include "QBibtex_moc.cpp" +#include "GuiBibtex_moc.cpp" diff --git a/src/frontends/qt4/QBibtex.h b/src/frontends/qt4/GuiBibtex.h similarity index 79% rename from src/frontends/qt4/QBibtex.h rename to src/frontends/qt4/GuiBibtex.h index 0cc399f138..027d539634 100644 --- a/src/frontends/qt4/QBibtex.h +++ b/src/frontends/qt4/GuiBibtex.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QBibtex.h + * \file GuiBibtex.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QBIBTEX_H #define QBIBTEX_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_BibtexUi.h" #include "ui_BibtexAddUi.h" @@ -25,7 +25,7 @@ namespace lyx { namespace frontend { -class QBibtex; +class GuiBibtex; template class UiDialog : public QDialog, public UI @@ -40,13 +40,13 @@ public: }; -class QBibtexDialog : public QDialog, public Ui::QBibtexUi { +class GuiBibtexDialog : public QDialog, public Ui::BibtexUi { Q_OBJECT public: - QBibtexDialog(QBibtex * form); + GuiBibtexDialog(GuiBibtex * form); - UiDialog * add_; + UiDialog * add_; protected Q_SLOTS: virtual void change_adaptor(); @@ -63,20 +63,20 @@ protected: virtual void closeEvent(QCloseEvent * e); private: - QBibtex * form_; + GuiBibtex * form_; ButtonController add_bc_; }; class ControlBibtex; -class QBibtex - : public QController > +class GuiBibtex + : public QController > { public: - friend class QBibtexDialog; + friend class GuiBibtexDialog; - QBibtex(Dialog &); + GuiBibtex(Dialog &); protected: virtual bool isValid(); private: diff --git a/src/frontends/qt4/QBox.cpp b/src/frontends/qt4/GuiBox.cpp similarity index 94% rename from src/frontends/qt4/QBox.cpp rename to src/frontends/qt4/GuiBox.cpp index 18653245ab..751c4683a7 100644 --- a/src/frontends/qt4/QBox.cpp +++ b/src/frontends/qt4/GuiBox.cpp @@ -1,5 +1,5 @@ /** - * \file QBox.cpp + * \file GuiBox.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "QBox.h" +#include "GuiBox.h" #include "CheckedLineEdit.h" #include "LengthCombo.h" @@ -45,11 +45,11 @@ namespace frontend { ////////////////////////////////////////////////////////////////// // -// QBoxDialog +// GuiBoxDialog // ////////////////////////////////////////////////////////////////// -QBoxDialog::QBoxDialog(QBox * form) +GuiBoxDialog::GuiBoxDialog(GuiBox * form) : form_(form) { setupUi(this); @@ -82,20 +82,20 @@ QBoxDialog::QBoxDialog(QBox * form) } -void QBoxDialog::closeEvent(QCloseEvent * e) +void GuiBoxDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QBoxDialog::change_adaptor() +void GuiBoxDialog::change_adaptor() { form_->changed(); } -void QBoxDialog::innerBoxChanged(const QString & str) +void GuiBoxDialog::innerBoxChanged(const QString & str) { bool const ibox = (str != qt_("None")); valignCO->setEnabled(ibox); @@ -107,7 +107,7 @@ void QBoxDialog::innerBoxChanged(const QString & str) } -void QBoxDialog::typeChanged(int index) +void GuiBoxDialog::typeChanged(int index) { bool const frameless = (index == 0); if (frameless) { @@ -123,7 +123,7 @@ void QBoxDialog::typeChanged(int index) } -void QBoxDialog::restoreClicked() +void GuiBoxDialog::restoreClicked() { form_->setInnerType(true, 2); widthED->setText("100"); @@ -138,20 +138,20 @@ void QBoxDialog::restoreClicked() ////////////////////////////////////////////////////////////////// // -// QBox +// GuiBox // ////////////////////////////////////////////////////////////////// -typedef QController > box_base_class; +typedef QController > box_base_class; -QBox::QBox(Dialog & parent) +GuiBox::GuiBox(Dialog & parent) : box_base_class(parent, _("Box Settings")) {} -void QBox::build_dialog() +void GuiBox::build_dialog() { - dialog_.reset(new QBoxDialog(this)); + dialog_.reset(new GuiBoxDialog(this)); // fill the box type choice box_gui_tokens(ids_, gui_names_); @@ -185,7 +185,7 @@ void QBox::build_dialog() } -void QBox::update_contents() +void GuiBox::update_contents() { string type(controller().params().type); for (unsigned int i = 0; i < gui_names_.size(); ++i) { @@ -259,7 +259,7 @@ void QBox::update_contents() } -void QBox::apply() +void GuiBox::apply() { controller().params().type = ids_[dialog_->typeCO->currentIndex()]; @@ -346,7 +346,7 @@ void QBox::apply() } -void QBox::setSpecial(bool ibox) +void GuiBox::setSpecial(bool ibox) { box_gui_tokens_special_length(ids_spec_, gui_names_spec_); // check if the widget contains the special units @@ -368,7 +368,7 @@ void QBox::setSpecial(bool ibox) } -void QBox::setInnerType(bool frameless, int i) +void GuiBox::setInnerType(bool frameless, int i) { // with "frameless" boxes, inner box is mandatory (i.e. is the actual box) // we have to remove "none" then and adjust the combo @@ -392,4 +392,4 @@ void QBox::setInnerType(bool frameless, int i) } // namespace lyx -#include "QBox_moc.cpp" +#include "GuiBox_moc.cpp" diff --git a/src/frontends/qt4/QBox.h b/src/frontends/qt4/GuiBox.h similarity index 81% rename from src/frontends/qt4/QBox.h rename to src/frontends/qt4/GuiBox.h index 5d8ba616ec..2763a591c6 100644 --- a/src/frontends/qt4/QBox.h +++ b/src/frontends/qt4/GuiBox.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QBox.h + * \file GuiBox.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef QBOX_H #define QBOX_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_BoxUi.h" @@ -27,12 +27,12 @@ namespace lyx { namespace frontend { class ControlBox; -class QBox; +class GuiBox; -class QBoxDialog : public QDialog, public Ui::QBoxUi { +class GuiBoxDialog : public QDialog, public Ui::BoxUi { Q_OBJECT public: - QBoxDialog(QBox * form); + GuiBoxDialog(GuiBox * form); protected Q_SLOTS: virtual void change_adaptor(); virtual void innerBoxChanged(const QString &); @@ -41,19 +41,19 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QBox * form_; + GuiBox * form_; }; /// -class QBox - : public QController > +class GuiBox + : public QController > { public: /// - friend class QBoxDialog; + friend class GuiBoxDialog; /// - QBox(Dialog &); + GuiBox(Dialog &); /// add and remove special lengths void setSpecial(bool ibox); /// only show valid inner box items diff --git a/src/frontends/qt4/QBranch.cpp b/src/frontends/qt4/GuiBranch.cpp similarity index 79% rename from src/frontends/qt4/QBranch.cpp rename to src/frontends/qt4/GuiBranch.cpp index 6bdf0f8626..f9d33309d4 100644 --- a/src/frontends/qt4/QBranch.cpp +++ b/src/frontends/qt4/GuiBranch.cpp @@ -1,5 +1,5 @@ /** - * \file QBranch.cpp + * \file GuiBranch.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QBranch.h" +#include "GuiBranch.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -28,11 +28,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QBranchDialog +// GuiBranchDialog // ///////////////////////////////////////////////////////////////////// -QBranchDialog::QBranchDialog(QBranch * form) +GuiBranchDialog::GuiBranchDialog(GuiBranch * form) : form_(form) { setupUi(this); @@ -45,14 +45,14 @@ QBranchDialog::QBranchDialog(QBranch * form) } -void QBranchDialog::closeEvent(QCloseEvent * e) +void GuiBranchDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QBranchDialog::change_adaptor() +void GuiBranchDialog::change_adaptor() { form_->changed(); } @@ -60,28 +60,28 @@ void QBranchDialog::change_adaptor() ///////////////////////////////////////////////////////////////////// // -// QBranch +// GuiBranch // ///////////////////////////////////////////////////////////////////// -typedef QController > branch_base_class; +typedef QController > branch_base_class; -QBranch::QBranch(Dialog & parent) +GuiBranch::GuiBranch(Dialog & parent) : branch_base_class(parent, _("Branch Settings")) {} -void QBranch::build_dialog() +void GuiBranch::build_dialog() { - dialog_.reset(new QBranchDialog(this)); + dialog_.reset(new GuiBranchDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); } -void QBranch::update_contents() +void GuiBranch::update_contents() { typedef BranchList::const_iterator const_iterator; @@ -105,7 +105,7 @@ void QBranch::update_contents() } -void QBranch::apply() +void GuiBranch::apply() { docstring const type = qstring_to_ucs4(dialog_->branchCO->currentText()); controller().params().branch = type; @@ -114,4 +114,4 @@ void QBranch::apply() } // namespace frontend } // namespace lyx -#include "QBranch_moc.cpp" +#include "GuiBranch_moc.cpp" diff --git a/src/frontends/qt4/QBranch.h b/src/frontends/qt4/GuiBranch.h similarity index 73% rename from src/frontends/qt4/QBranch.h rename to src/frontends/qt4/GuiBranch.h index 4672b956a5..836da8217e 100644 --- a/src/frontends/qt4/QBranch.h +++ b/src/frontends/qt4/GuiBranch.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QBranch.h + * \file GuiBranch.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QBRANCH_H #define QBRANCH_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_BranchUi.h" #include @@ -21,31 +21,31 @@ namespace lyx { namespace frontend { -class QBranch; +class GuiBranch; -class QBranchDialog : public QDialog, public Ui::QBranchUi { +class GuiBranchDialog : public QDialog, public Ui::BranchUi { Q_OBJECT public: - QBranchDialog(QBranch * form); + GuiBranchDialog(GuiBranch * form); protected Q_SLOTS: virtual void change_adaptor(); protected: virtual void closeEvent(QCloseEvent * e); private: - QBranch * form_; + GuiBranch * form_; }; class ControlBranch; /** This class provides a QT implementation of the Branch Dialog. */ -class QBranch : public QController > +class GuiBranch : public QController > { public: - friend class QBranchDialog; + friend class GuiBranchDialog; /// Constructor - QBranch(Dialog &); + GuiBranch(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QBranches.cpp b/src/frontends/qt4/GuiBranches.cpp similarity index 84% rename from src/frontends/qt4/QBranches.cpp rename to src/frontends/qt4/GuiBranches.cpp index c777f6cfe5..1529a7880d 100644 --- a/src/frontends/qt4/QBranches.cpp +++ b/src/frontends/qt4/GuiBranches.cpp @@ -1,5 +1,5 @@ /** - * \file QBranches.cpp + * \file GuiBranches.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QBranches.h" +#include "GuiBranches.h" #include "GuiApplication.h" #include "Validator.h" @@ -34,7 +34,7 @@ namespace lyx { namespace frontend { -QBranches::QBranches(QWidget * parent, Qt::WFlags f) +GuiBranches::GuiBranches(QWidget * parent, Qt::WFlags f) : QWidget(parent, f) { setupUi(this); @@ -45,13 +45,13 @@ QBranches::QBranches(QWidget * parent, Qt::WFlags f) branchesTW->setSortingEnabled(true); } -void QBranches::update(BufferParams const & params) +void GuiBranches::update(BufferParams const & params) { branchlist_ = params.branchlist(); update(); } -void QBranches::update() +void GuiBranches::update() { // store the selected branch QTreeWidgetItem * item = branchesTW->currentItem(); @@ -89,12 +89,12 @@ void QBranches::update() changed(); } -void QBranches::apply(BufferParams & params) const +void GuiBranches::apply(BufferParams & params) const { params.branchlist() = branchlist_; } -void QBranches::on_addBranchPB_pressed() +void GuiBranches::on_addBranchPB_pressed() { QString const new_branch = newBranchLE->text(); if (!new_branch.isEmpty()) { @@ -105,7 +105,7 @@ void QBranches::on_addBranchPB_pressed() } -void QBranches::on_removePB_pressed() +void GuiBranches::on_removePB_pressed() { QTreeWidgetItem * selItem = branchesTW->currentItem(); @@ -120,13 +120,13 @@ void QBranches::on_removePB_pressed() } -void QBranches::on_activatePB_pressed() +void GuiBranches::on_activatePB_pressed() { toggleBranch(branchesTW->currentItem()); } -void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int col) +void GuiBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int col) { if (col < 2) toggleBranch(item); @@ -135,7 +135,7 @@ void QBranches::on_branchesTW_itemDoubleClicked(QTreeWidgetItem * item, int col) } -void QBranches::toggleBranch(QTreeWidgetItem * item) +void GuiBranches::toggleBranch(QTreeWidgetItem * item) { if (item == 0) return; @@ -152,13 +152,13 @@ void QBranches::toggleBranch(QTreeWidgetItem * item) } -void QBranches::on_colorPB_clicked() +void GuiBranches::on_colorPB_clicked() { toggleColor(branchesTW->currentItem()); } -void QBranches::toggleColor(QTreeWidgetItem * item) +void GuiBranches::toggleColor(QTreeWidgetItem * item) { if (item == 0) return; @@ -185,4 +185,4 @@ void QBranches::toggleColor(QTreeWidgetItem * item) } // namespace frontend } // namespace lyx -#include "QBranches_moc.cpp" +#include "GuiBranches_moc.cpp" diff --git a/src/frontends/qt4/QBranches.h b/src/frontends/qt4/GuiBranches.h similarity index 87% rename from src/frontends/qt4/QBranches.h rename to src/frontends/qt4/GuiBranches.h index 2e52efaf28..bd1ed0b0ec 100644 --- a/src/frontends/qt4/QBranches.h +++ b/src/frontends/qt4/GuiBranches.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QBranches.h + * \file GuiBranches.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define QBRANCHES_H #include "ui_BranchesUi.h" -#include "QDocument.h" +#include "GuiDocument.h" #include "BranchList.h" #include @@ -31,11 +31,11 @@ class BufferParams; namespace frontend { -class QBranches: public QWidget, public Ui::BranchesUi +class GuiBranches: public QWidget, public Ui::BranchesUi { Q_OBJECT public: - QBranches(QWidget * parent=0, Qt::WFlags f=0); + GuiBranches(QWidget * parent=0, Qt::WFlags f=0); void update(BufferParams const & params); void apply(BufferParams & params) const; diff --git a/src/frontends/qt4/QChanges.cpp b/src/frontends/qt4/GuiChanges.cpp similarity index 74% rename from src/frontends/qt4/QChanges.cpp rename to src/frontends/qt4/GuiChanges.cpp index e7613e03d8..05d1cf41e7 100644 --- a/src/frontends/qt4/QChanges.cpp +++ b/src/frontends/qt4/GuiChanges.cpp @@ -1,5 +1,5 @@ /** - * \file QChanges.cpp + * \file GuiChanges.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QChanges.h" +#include "GuiChanges.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -31,11 +31,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QChangesDialog +// GuiChangesDialog // ///////////////////////////////////////////////////////////////////// -QChangesDialog::QChangesDialog(QChanges * form) +GuiChangesDialog::GuiChangesDialog(GuiChanges * form) : form_(form) { setupUi(this); @@ -46,25 +46,25 @@ QChangesDialog::QChangesDialog(QChanges * form) } -void QChangesDialog::nextPressed() +void GuiChangesDialog::nextPressed() { form_->next(); } -void QChangesDialog::acceptPressed() +void GuiChangesDialog::acceptPressed() { form_->accept(); } -void QChangesDialog::rejectPressed() +void GuiChangesDialog::rejectPressed() { form_->reject(); } -void QChangesDialog::closeEvent(QCloseEvent *e) +void GuiChangesDialog::closeEvent(QCloseEvent *e) { form_->slotWMHide(); e->accept(); @@ -74,22 +74,22 @@ void QChangesDialog::closeEvent(QCloseEvent *e) ///////////////////////////////////////////////////////////////////// // -// QChanges +// GuiChanges // ///////////////////////////////////////////////////////////////////// -typedef QController > ChangesBase; +typedef QController > ChangesBase; -QChanges::QChanges(Dialog & parent) +GuiChanges::GuiChanges(Dialog & parent) : ChangesBase(parent, _("Merge Changes")) { } -void QChanges::build_dialog() +void GuiChanges::build_dialog() { - dialog_.reset(new QChangesDialog(this)); + dialog_.reset(new GuiChangesDialog(this)); bcview().setCancel(dialog_->closePB); bcview().addReadOnly(dialog_->acceptPB); @@ -97,7 +97,7 @@ void QChanges::build_dialog() } -void QChanges::update_contents() +void GuiChanges::update_contents() { docstring text; docstring author = controller().getChangeAuthor(); @@ -112,19 +112,19 @@ void QChanges::update_contents() } -void QChanges::next() +void GuiChanges::next() { controller().next(); } -void QChanges::accept() +void GuiChanges::accept() { controller().accept(); } -void QChanges::reject() +void GuiChanges::reject() { controller().reject(); } @@ -132,4 +132,4 @@ void QChanges::reject() } // namespace frontend } // namespace lyx -#include "QChanges_moc.cpp" +#include "GuiChanges_moc.cpp" diff --git a/src/frontends/qt4/QChanges.h b/src/frontends/qt4/GuiChanges.h similarity index 72% rename from src/frontends/qt4/QChanges.h rename to src/frontends/qt4/GuiChanges.h index 777b52e9b4..9df8b9f715 100644 --- a/src/frontends/qt4/QChanges.h +++ b/src/frontends/qt4/GuiChanges.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QChanges.h + * \file GuiChanges.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QCHANGES_H #define QCHANGES_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_ChangesUi.h" #include #include @@ -20,13 +20,13 @@ namespace lyx { namespace frontend { -class QChanges; +class GuiChanges; -class QChangesDialog : public QDialog, public Ui::QChangesUi { +class GuiChangesDialog : public QDialog, public Ui::ChangesUi { Q_OBJECT public: - QChangesDialog(QChanges * form); + GuiChangesDialog(GuiChanges * form); protected Q_SLOTS: @@ -38,18 +38,18 @@ protected: virtual void closeEvent(QCloseEvent * e); private: - QChanges * form_; + GuiChanges * form_; }; class ControlChanges; -class QChanges - : public QController > +class GuiChanges + : public QController > { public: - friend class QChangesDialog; + friend class GuiChangesDialog; - QChanges(Dialog &); + GuiChanges(Dialog &); void accept(); diff --git a/src/frontends/qt4/QCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp similarity index 91% rename from src/frontends/qt4/QCharacter.cpp rename to src/frontends/qt4/GuiCharacter.cpp index 44cb05889c..d9ee64514b 100644 --- a/src/frontends/qt4/QCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -1,5 +1,5 @@ /** - * \file QCharacter.cpp + * \file GuiCharacter.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QCharacter.h" +#include "GuiCharacter.h" #include "ControlCharacter.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -28,11 +28,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QCharacterDialog +// GuiCharacterDialog // ///////////////////////////////////////////////////////////////////// -QCharacterDialog::QCharacterDialog(QCharacter * form) +GuiCharacterDialog::GuiCharacterDialog(GuiCharacter * form) : form_(form) { setupUi(this); @@ -51,7 +51,7 @@ QCharacterDialog::QCharacterDialog(QCharacter * form) } -void QCharacterDialog::change_adaptor() +void GuiCharacterDialog::change_adaptor() { form_->changed(); @@ -73,7 +73,7 @@ void QCharacterDialog::change_adaptor() } -void QCharacterDialog::closeEvent(QCloseEvent * e) +void GuiCharacterDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); @@ -82,21 +82,21 @@ void QCharacterDialog::closeEvent(QCloseEvent * e) ///////////////////////////////////////////////////////////////////// // -// QCharacter +// GuiCharacter // ///////////////////////////////////////////////////////////////////// -typedef QController > CharacterBase; +typedef QController > CharacterBase; -QCharacter::QCharacter(Dialog & parent) +GuiCharacter::GuiCharacter(Dialog & parent) : CharacterBase(parent, _("Text Style")) { } -void QCharacter::build_dialog() +void GuiCharacter::build_dialog() { - dialog_.reset(new QCharacterDialog(this)); + dialog_.reset(new GuiCharacterDialog(this)); family = getFamilyData(); series = getSeriesData(); @@ -177,7 +177,7 @@ int findPos2nd(vector > const & vec, B const & val) } // namespace anon -void QCharacter::update_contents() +void GuiCharacter::update_contents() { ControlCharacter const & ctrl = controller(); @@ -196,7 +196,7 @@ void QCharacter::update_contents() } -void QCharacter::apply() +void GuiCharacter::apply() { ControlCharacter & ctrl = controller(); @@ -214,4 +214,4 @@ void QCharacter::apply() } // namespace frontend } // namespace lyx -#include "QCharacter_moc.cpp" +#include "GuiCharacter_moc.cpp" diff --git a/src/frontends/qt4/QCharacter.h b/src/frontends/qt4/GuiCharacter.h similarity index 75% rename from src/frontends/qt4/QCharacter.h rename to src/frontends/qt4/GuiCharacter.h index 5bb772601c..7cce5132f9 100644 --- a/src/frontends/qt4/QCharacter.h +++ b/src/frontends/qt4/GuiCharacter.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QCharacter.h + * \file GuiCharacter.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef QCHARACTER_H_CONTROLLER #define QCHARACTER_H_CONTROLLER -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_CharacterUi.h" #include @@ -27,16 +27,16 @@ class Font; namespace frontend { -class QCharacter; +class GuiCharacter; -class QCharacterDialog : public QDialog, public Ui::QCharacterUi { +class GuiCharacterDialog : public QDialog, public Ui::CharacterUi { Q_OBJECT public: - QCharacterDialog(QCharacter * form); + GuiCharacterDialog(GuiCharacter * form); protected: void closeEvent(QCloseEvent * e); private: - QCharacter * form_; + GuiCharacter * form_; protected Q_SLOTS: void change_adaptor(); }; @@ -44,13 +44,13 @@ protected Q_SLOTS: class ControlCharacter; -class QCharacter - : public QController > +class GuiCharacter + : public QController > { public: - friend class QCharacterDialog; + friend class GuiCharacterDialog; - QCharacter(Dialog &); + GuiCharacter(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QCitation.cpp b/src/frontends/qt4/GuiCitation.cpp similarity index 84% rename from src/frontends/qt4/QCitation.cpp rename to src/frontends/qt4/GuiCitation.cpp index 8224bd6813..84bc19e6ed 100644 --- a/src/frontends/qt4/QCitation.cpp +++ b/src/frontends/qt4/GuiCitation.cpp @@ -1,5 +1,5 @@ /** - * \file QCitation.cpp + * \file GuiCitation.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #include -#include "QCitation.h" +#include "GuiCitation.h" #include "qt_helpers.h" @@ -58,13 +58,13 @@ namespace lyx { namespace frontend { -QCitation::QCitation(Dialog & parent) +GuiCitation::GuiCitation(Dialog & parent) : ControlCitation(parent) { } -void QCitation::apply(int const choice, bool const full, bool const force, +void GuiCitation::apply(int const choice, bool const full, bool const force, QString before, QString after) { if (cited_keys_.isEmpty()) @@ -85,26 +85,26 @@ void QCitation::apply(int const choice, bool const full, bool const force, } -void QCitation::clearSelection() +void GuiCitation::clearSelection() { cited_keys_.clear(); selected_model_.setStringList(cited_keys_); } -QString QCitation::textBefore() +QString GuiCitation::textBefore() { return toqstr(params()["before"]); } -QString QCitation::textAfter() +QString GuiCitation::textAfter() { return toqstr(params()["after"]); } -bool QCitation::initialiseParams(std::string const & data) +bool GuiCitation::initialiseParams(std::string const & data) { if (!ControlCitation::initialiseParams(data)) return false; @@ -113,7 +113,7 @@ bool QCitation::initialiseParams(std::string const & data) } -void QCitation::init() +void GuiCitation::init() { // Make the list of all available bibliography keys all_keys_ = to_qstring_list(availableKeys()); @@ -129,7 +129,7 @@ void QCitation::init() } -void QCitation::findKey(QString const & str, bool only_keys, +void GuiCitation::findKey(QString const & str, bool only_keys, docstring field, docstring entryType, bool case_sensitive, bool reg_exp, bool reset) { @@ -141,7 +141,7 @@ void QCitation::findKey(QString const & str, bool only_keys, // Reset last_searched_string in case of changed option. if (last_case_sensitive != case_sensitive || last_reg_exp != reg_exp) { - LYXERR(Debug::GUI) << "QCitation::findKey: optimisation disabled!" << std::endl; + LYXERR(Debug::GUI) << "GuiCitation::findKey: optimisation disabled!" << std::endl; last_searched_string.clear(); } // save option for next search. @@ -181,29 +181,29 @@ void QCitation::findKey(QString const & str, bool only_keys, } -QStringList QCitation::getFieldsAsQStringList() { +QStringList GuiCitation::getFieldsAsQStringList() { return to_qstring_list(availableFields()); } -QStringList QCitation::getEntriesAsQStringList() { +QStringList GuiCitation::getEntriesAsQStringList() { return to_qstring_list(availableEntries()); } -QStringList QCitation::citationStyles(int sel) +QStringList GuiCitation::citationStyles(int sel) { docstring const key = qstring_to_ucs4(cited_keys_[sel]); return to_qstring_list(getCiteStrings(key)); } -QString QCitation::getKeyInfo(QString const & sel) +QString GuiCitation::getKeyInfo(QString const & sel) { return toqstr(getInfo(qstring_to_ucs4(sel))); } -void QCitation::setCitedKeys() +void GuiCitation::setCitedKeys() { cited_keys_ = selected_model_.stringList(); } diff --git a/src/frontends/qt4/QCitation.h b/src/frontends/qt4/GuiCitation.h similarity index 94% rename from src/frontends/qt4/QCitation.h rename to src/frontends/qt4/GuiCitation.h index e99a4fc24b..f99b009b67 100644 --- a/src/frontends/qt4/QCitation.h +++ b/src/frontends/qt4/GuiCitation.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QCitation.h + * \file GuiCitation.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -24,12 +24,12 @@ namespace lyx { namespace frontend { -class QCitation : public ControlCitation +class GuiCitation : public ControlCitation { public: /// - QCitation(Dialog &); - virtual ~QCitation() {} + GuiCitation(Dialog &); + virtual ~GuiCitation() {} virtual bool initialiseParams(std::string const & data); /// diff --git a/src/frontends/qt4/QCitationDialog.cpp b/src/frontends/qt4/GuiCitationDialog.cpp similarity index 85% rename from src/frontends/qt4/QCitationDialog.cpp rename to src/frontends/qt4/GuiCitationDialog.cpp index a6c63e0b2f..4d2b50e564 100644 --- a/src/frontends/qt4/QCitationDialog.cpp +++ b/src/frontends/qt4/GuiCitationDialog.cpp @@ -1,5 +1,5 @@ /** - * \file QCitationDialog.cpp + * \file GuiCitationDialog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,9 +14,9 @@ #include -#include "QCitationDialog.h" +#include "GuiCitationDialog.h" -#include "QCitation.h" +#include "GuiCitation.h" #include "frontends/controllers/frontend_helpers.h" #include "frontends/controllers/ControlCitation.h" @@ -43,7 +43,7 @@ namespace lyx { namespace frontend { -QCitationDialog::QCitationDialog(Dialog & dialog, QCitation * form) +GuiCitationDialog::GuiCitationDialog(Dialog & dialog, GuiCitation * form) : Dialog::View(dialog, _("Citation")), form_(form) { setupUi(this); @@ -65,7 +65,7 @@ QCitationDialog::QCitationDialog(Dialog & dialog, QCitation * form) connect(this, SIGNAL(rejected()), this, SLOT(cleanUp())); selectionManager = - new QSelectionManager(availableLV, selectedLV, + new GuiSelectionManager(availableLV, selectedLV, addPB, deletePB, upPB, downPB, form_->available(), form_->selected()); connect(selectionManager, SIGNAL(selectionChanged()), @@ -78,11 +78,11 @@ QCitationDialog::QCitationDialog(Dialog & dialog, QCitation * form) } -QCitationDialog::~QCitationDialog() +GuiCitationDialog::~GuiCitationDialog() {} -void QCitationDialog::cleanUp() +void GuiCitationDialog::cleanUp() { form_->clearSelection(); form_->clearParams(); @@ -90,7 +90,7 @@ void QCitationDialog::cleanUp() } -void QCitationDialog::closeEvent(QCloseEvent * e) +void GuiCitationDialog::closeEvent(QCloseEvent * e) { form_->clearSelection(); form_->clearParams(); @@ -98,7 +98,7 @@ void QCitationDialog::closeEvent(QCloseEvent * e) } -void QCitationDialog::apply() +void GuiCitationDialog::apply() { int const choice = std::max(0, citationStyleCO->currentIndex()); style_ = choice; @@ -112,14 +112,14 @@ void QCitationDialog::apply() } -void QCitationDialog::hide() +void GuiCitationDialog::hide() { form_->clearParams(); accept(); } -void QCitationDialog::show() +void GuiCitationDialog::show() { findLE->clear(); availableLV->setFocus(); @@ -129,13 +129,13 @@ void QCitationDialog::show() } -bool QCitationDialog::isVisible() const +bool GuiCitationDialog::isVisible() const { return QDialog::isVisible(); } -void QCitationDialog::on_okPB_clicked() +void GuiCitationDialog::on_okPB_clicked() { apply(); form_->clearSelection(); @@ -143,27 +143,27 @@ void QCitationDialog::on_okPB_clicked() } -void QCitationDialog::on_cancelPB_clicked() +void GuiCitationDialog::on_cancelPB_clicked() { form_->clearSelection(); hide(); } -void QCitationDialog::on_applyPB_clicked() +void GuiCitationDialog::on_applyPB_clicked() { apply(); } -void QCitationDialog::on_restorePB_clicked() +void GuiCitationDialog::on_restorePB_clicked() { form_->init(); update(); } -void QCitationDialog::update() +void GuiCitationDialog::update() { fillFields(); fillEntries(); @@ -177,7 +177,7 @@ void QCitationDialog::update() //will not have changed. At the moment, however, the division between //fillStyles() and updateStyles() doesn't lend itself to dividing the //two methods, though they should be divisible. -void QCitationDialog::updateDialog() +void GuiCitationDialog::updateDialog() { if (selectionManager->selectedFocused()) { if (selectedLV->selectionModel()->selectedIndexes().isEmpty()) @@ -199,7 +199,7 @@ void QCitationDialog::updateDialog() } -void QCitationDialog::updateStyle() +void GuiCitationDialog::updateStyle() { biblio::CiteEngine const engine = form_->getEngine(); bool const natbib_engine = @@ -249,7 +249,7 @@ void QCitationDialog::updateStyle() //This one needs to be called whenever citationStyleCO needs //to be updated---and this would be on anything that changes the //selection in selectedLV, or on a general update. -void QCitationDialog::fillStyles() +void GuiCitationDialog::fillStyles() { int const oldIndex = citationStyleCO->currentIndex(); @@ -287,7 +287,7 @@ void QCitationDialog::fillStyles() } -void QCitationDialog::fillFields() +void GuiCitationDialog::fillFields() { fieldsCO->blockSignals(true); int const oldIndex = fieldsCO->currentIndex(); @@ -302,7 +302,7 @@ void QCitationDialog::fillFields() } -void QCitationDialog::fillEntries() +void GuiCitationDialog::fillEntries() { entriesCO->blockSignals(true); int const oldIndex = entriesCO->currentIndex(); @@ -316,14 +316,14 @@ void QCitationDialog::fillEntries() } -bool QCitationDialog::isSelected(const QModelIndex & idx) +bool GuiCitationDialog::isSelected(const QModelIndex & idx) { QString const str = idx.data().toString(); return form_->selected()->stringList().contains(str); } -void QCitationDialog::setButtons() +void GuiCitationDialog::setButtons() { selectionManager->update(); int const srows = selectedLV->model()->rowCount(); @@ -332,7 +332,7 @@ void QCitationDialog::setButtons() } -void QCitationDialog::updateInfo(QModelIndex const & idx) +void GuiCitationDialog::updateInfo(QModelIndex const & idx) { if (idx.isValid()) { QString const keytxt = form_->getKeyInfo(idx.data().toString()); @@ -342,13 +342,13 @@ void QCitationDialog::updateInfo(QModelIndex const & idx) } -void QCitationDialog::setCitedKeys() +void GuiCitationDialog::setCitedKeys() { form_->setCitedKeys(); } -void QCitationDialog::findText(QString const & text, bool reset) +void GuiCitationDialog::findText(QString const & text, bool reset) { //"All Fields" and "Keys" are the first two int index = fieldsCO->currentIndex() - 2; @@ -386,19 +386,19 @@ void QCitationDialog::findText(QString const & text, bool reset) } -void QCitationDialog::on_fieldsCO_currentIndexChanged(int /*index*/) +void GuiCitationDialog::on_fieldsCO_currentIndexChanged(int /*index*/) { findText(findLE->text(), true); } -void QCitationDialog::on_entriesCO_currentIndexChanged(int /*index*/) +void GuiCitationDialog::on_entriesCO_currentIndexChanged(int /*index*/) { findText(findLE->text(), true); } -void QCitationDialog::on_findLE_textChanged(const QString & text) +void GuiCitationDialog::on_findLE_textChanged(const QString & text) { clearPB->setDisabled(text.isEmpty()); if (text.isEmpty()) @@ -407,19 +407,19 @@ void QCitationDialog::on_findLE_textChanged(const QString & text) } -void QCitationDialog::on_caseCB_stateChanged(int) +void GuiCitationDialog::on_caseCB_stateChanged(int) { findText(findLE->text()); } -void QCitationDialog::on_regexCB_stateChanged(int) +void GuiCitationDialog::on_regexCB_stateChanged(int) { findText(findLE->text()); } -void QCitationDialog::changed() +void GuiCitationDialog::changed() { fillStyles(); setButtons(); @@ -429,4 +429,4 @@ void QCitationDialog::changed() } // namespace frontend } // namespace lyx -#include "QCitationDialog_moc.cpp" +#include "GuiCitationDialog_moc.cpp" diff --git a/src/frontends/qt4/QCitationDialog.h b/src/frontends/qt4/GuiCitationDialog.h similarity index 85% rename from src/frontends/qt4/QCitationDialog.h rename to src/frontends/qt4/GuiCitationDialog.h index 26a65ebec8..cec477270d 100644 --- a/src/frontends/qt4/QCitationDialog.h +++ b/src/frontends/qt4/GuiCitationDialog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QCitationDialog.h + * \file GuiCitationDialog.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -15,7 +15,7 @@ #define QCITATIONDIALOG_H #include "Dialog.h" -#include "QSelectionManager.h" +#include "GuiSelectionManager.h" #include "ui_CitationUi.h" #include @@ -26,15 +26,17 @@ namespace lyx { namespace frontend { -class QCitation; +class GuiCitation; -class QCitationDialog: public QDialog, public Ui::QCitationUi, public Dialog::View { +class GuiCitationDialog : public QDialog, + public Ui::CitationUi, public Dialog::View +{ Q_OBJECT public: - QCitationDialog(Dialog &, QCitation * form ); + GuiCitationDialog(Dialog &, GuiCitation * form ); - virtual ~QCitationDialog(); + virtual ~GuiCitationDialog(); virtual void apply(); @@ -56,7 +58,7 @@ public Q_SLOTS: protected: void closeEvent (QCloseEvent * e); - /// prepares a call to QCitation::searchKeys when we + /// prepares a call to GuiCitation::searchKeys when we /// are ready to search the BibTeX entries void findText(QString const & text, bool reset = false); /// check whether key is already selected @@ -95,9 +97,9 @@ private: /// last used citation style int style_; - QCitation * form_; + GuiCitation * form_; - QSelectionManager * selectionManager; + GuiSelectionManager * selectionManager; }; } // namespace frontend diff --git a/src/frontends/qt4/QCommandBuffer.cpp b/src/frontends/qt4/GuiCommandBuffer.cpp similarity index 91% rename from src/frontends/qt4/QCommandBuffer.cpp rename to src/frontends/qt4/GuiCommandBuffer.cpp index d17e10e174..2817ab5535 100644 --- a/src/frontends/qt4/QCommandBuffer.cpp +++ b/src/frontends/qt4/GuiCommandBuffer.cpp @@ -1,5 +1,5 @@ /** - * \file QCommandBuffer.cpp + * \file GuiCommandBuffer.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,8 +14,8 @@ // All is well if the namespace is visible first. #include "GuiView.h" -#include "QCommandBuffer.h" -#include "QCommandEdit.h" +#include "GuiCommandBuffer.h" +#include "GuiCommandEdit.h" #include "qt_helpers.h" #include "support/filetools.h" @@ -75,7 +75,7 @@ protected: } // end of anon -QCommandBuffer::QCommandBuffer(GuiView * view) +GuiCommandBuffer::GuiCommandBuffer(GuiViewBase * view) : view_(view), controller_(*view) { QPixmap qpup(toqstr(libFileSearch("images", "up", "png").absFilename())); @@ -93,7 +93,7 @@ QCommandBuffer::QCommandBuffer(GuiView * view) down->setMaximumSize(24, 24); connect(down, SIGNAL(clicked()), this, SLOT(down())); - edit_ = new QCommandEdit(this); + edit_ = new GuiCommandEdit(this); edit_->setMinimumSize(edit_->sizeHint()); edit_->setFocusPolicy(Qt::ClickFocus); @@ -114,14 +114,14 @@ QCommandBuffer::QCommandBuffer(GuiView * view) } -void QCommandBuffer::cancel() +void GuiCommandBuffer::cancel() { view_->setFocus(); edit_->setText(QString()); } -void QCommandBuffer::dispatch() +void GuiCommandBuffer::dispatch() { controller_.dispatch(fromqstr(edit_->text())); view_->setFocus(); @@ -130,7 +130,7 @@ void QCommandBuffer::dispatch() } -void QCommandBuffer::complete() +void GuiCommandBuffer::complete() { string const input = fromqstr(edit_->text()); string new_input; @@ -175,7 +175,7 @@ void QCommandBuffer::complete() } -void QCommandBuffer::complete_selected(QListWidgetItem * item) +void GuiCommandBuffer::complete_selected(QListWidgetItem * item) { QWidget const * widget = static_cast(sender()); const_cast(widget)->hide(); @@ -185,7 +185,7 @@ void QCommandBuffer::complete_selected(QListWidgetItem * item) } -void QCommandBuffer::up() +void GuiCommandBuffer::up() { string const input = fromqstr(edit_->text()); string const h = controller_.historyUp(); @@ -198,7 +198,7 @@ void QCommandBuffer::up() } -void QCommandBuffer::down() +void GuiCommandBuffer::down() { string const input = fromqstr(edit_->text()); string const h = controller_.historyDown(); @@ -211,7 +211,7 @@ void QCommandBuffer::down() } -void QCommandBuffer::hideParent() +void GuiCommandBuffer::hideParent() { view_->setFocus(); edit_->setText(QString()); @@ -241,4 +241,4 @@ void XMiniBuffer::suffix_timeout() } // namespace frontend } // namespace lyx -#include "QCommandBuffer_moc.cpp" +#include "GuiCommandBuffer_moc.cpp" diff --git a/src/frontends/qt4/QCommandBuffer.h b/src/frontends/qt4/GuiCommandBuffer.h similarity index 83% rename from src/frontends/qt4/QCommandBuffer.h rename to src/frontends/qt4/GuiCommandBuffer.h index f13426eb32..370c937b9f 100644 --- a/src/frontends/qt4/QCommandBuffer.h +++ b/src/frontends/qt4/GuiCommandBuffer.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QCommandBuffer.h + * \file GuiCommandBuffer.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -21,13 +21,13 @@ class QListWidgetItem; namespace lyx { namespace frontend { -class QCommandEdit; +class GuiCommandEdit; class GuiView; -class QCommandBuffer : public QWidget { +class GuiCommandBuffer : public QWidget { Q_OBJECT public: - QCommandBuffer(GuiView * view); + GuiCommandBuffer(GuiViewBase * view); public Q_SLOTS: /// cancel command compose @@ -46,13 +46,13 @@ public Q_SLOTS: void hideParent(); private: /// owning view - GuiView * view_; + GuiViewBase * view_; /// controller ControlCommandBuffer controller_; /// command widget - QCommandEdit * edit_; + GuiCommandEdit * edit_; }; } // namespace frontend diff --git a/src/frontends/qt4/QCommandEdit.cpp b/src/frontends/qt4/GuiCommandEdit.cpp similarity index 82% rename from src/frontends/qt4/QCommandEdit.cpp rename to src/frontends/qt4/GuiCommandEdit.cpp index b15ad9765b..f952a2a3a5 100644 --- a/src/frontends/qt4/QCommandEdit.cpp +++ b/src/frontends/qt4/GuiCommandEdit.cpp @@ -1,5 +1,5 @@ /** - * \file QCommandEdit.cpp + * \file GuiCommandEdit.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QCommandEdit.h" +#include "GuiCommandEdit.h" #include #include @@ -20,14 +20,14 @@ namespace lyx { namespace frontend { -QCommandEdit::QCommandEdit(QWidget * parent) +GuiCommandEdit::GuiCommandEdit(QWidget * parent) : QLineEdit(parent) { setFocusPolicy(Qt::ClickFocus); } -void QCommandEdit::keyPressEvent(QKeyEvent * e) +void GuiCommandEdit::keyPressEvent(QKeyEvent * e) { switch (e->key()) { case Qt::Key_Escape: @@ -60,7 +60,7 @@ void QCommandEdit::keyPressEvent(QKeyEvent * e) } -bool QCommandEdit::event(QEvent * e) +bool GuiCommandEdit::event(QEvent * e) { if (e->type() != QEvent::KeyPress) return QLineEdit::event(e); @@ -78,4 +78,4 @@ bool QCommandEdit::event(QEvent * e) } // namespace frontend } // namespace lyx -#include "QCommandEdit_moc.cpp" +#include "GuiCommandEdit_moc.cpp" diff --git a/src/frontends/qt4/QCommandEdit.h b/src/frontends/qt4/GuiCommandEdit.h similarity index 88% rename from src/frontends/qt4/QCommandEdit.h rename to src/frontends/qt4/GuiCommandEdit.h index 9fbd02a42b..76756f4b93 100644 --- a/src/frontends/qt4/QCommandEdit.h +++ b/src/frontends/qt4/GuiCommandEdit.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QCommandEdit.h + * \file GuiCommandEdit.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -19,10 +19,10 @@ namespace lyx { namespace frontend { -class QCommandEdit : public QLineEdit { +class GuiCommandEdit : public QLineEdit { Q_OBJECT public: - QCommandEdit(QWidget * parent); + GuiCommandEdit(QWidget * parent); Q_SIGNALS: /// cancel void escapePressed(); diff --git a/src/frontends/qt4/QDelimiterDialog.cpp b/src/frontends/qt4/GuiDelimiterDialog.cpp similarity index 84% rename from src/frontends/qt4/QDelimiterDialog.cpp rename to src/frontends/qt4/GuiDelimiterDialog.cpp index 7084862c46..3162f00c69 100644 --- a/src/frontends/qt4/QDelimiterDialog.cpp +++ b/src/frontends/qt4/GuiDelimiterDialog.cpp @@ -1,5 +1,5 @@ /** - * \file QDelimiterDialog.cpp + * \file GuiDelimiterDialog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QDelimiterDialog.h" +#include "GuiDelimiterDialog.h" #include "GuiApplication.h" #include "GuiView.h" @@ -63,21 +63,21 @@ QString fix_name(QString const & str, bool big) } // namespace anon -typedef QController > delimiter_base; +typedef QController > delimiter_base; -QMathDelimiter::QMathDelimiter(Dialog & parent) +GuiMathDelimiter::GuiMathDelimiter(Dialog & parent) : delimiter_base(parent, _("Math Delimiter")) {} -void QMathDelimiter::build_dialog() +void GuiMathDelimiter::build_dialog() { - dialog_.reset(new QDelimiterDialog(this, - static_cast(controller().view()))); + dialog_.reset(new GuiDelimiterDialog(this, + static_cast(controller().view()))); } -char_type QDelimiterDialog::doMatch(char_type const symbol) const +char_type GuiDelimiterDialog::doMatch(char_type const symbol) const { string const & str = form_->controller().texName(symbol); string match; @@ -102,7 +102,7 @@ char_type QDelimiterDialog::doMatch(char_type const symbol) const } -QDelimiterDialog::QDelimiterDialog(QMathDelimiter * form, QWidget * parent) +GuiDelimiterDialog::GuiDelimiterDialog(GuiMathDelimiter * form, QWidget * parent) : QDialog(parent), form_(form) { setupUi(this); @@ -153,7 +153,7 @@ QDelimiterDialog::QDelimiterDialog(QMathDelimiter * form, QWidget * parent) } -void QDelimiterDialog::updateTeXCode(int size) +void GuiDelimiterDialog::updateTeXCode(int size) { bool const bigsize = size != 0; @@ -191,7 +191,7 @@ void QDelimiterDialog::updateTeXCode(int size) } -void QDelimiterDialog::on_insertPB_clicked() +void GuiDelimiterDialog::on_insertPB_clicked() { if (sizeCO->currentIndex() == 0) form_->controller().dispatchDelim(fromqstr(tex_code_)); @@ -203,27 +203,27 @@ void QDelimiterDialog::on_insertPB_clicked() } -void QDelimiterDialog::on_sizeCO_activated(int index) +void GuiDelimiterDialog::on_sizeCO_activated(int index) { updateTeXCode(index); } -void QDelimiterDialog::on_leftLW_itemActivated(QListWidgetItem *) +void GuiDelimiterDialog::on_leftLW_itemActivated(QListWidgetItem *) { on_insertPB_clicked(); accept(); } -void QDelimiterDialog::on_rightLW_itemActivated(QListWidgetItem *) +void GuiDelimiterDialog::on_rightLW_itemActivated(QListWidgetItem *) { on_insertPB_clicked(); accept(); } -void QDelimiterDialog::on_leftLW_currentRowChanged(int item) +void GuiDelimiterDialog::on_leftLW_currentRowChanged(int item) { if (matchCB->isChecked()) rightLW->setCurrentRow(item); @@ -232,7 +232,7 @@ void QDelimiterDialog::on_leftLW_currentRowChanged(int item) } -void QDelimiterDialog::on_rightLW_currentRowChanged(int item) +void GuiDelimiterDialog::on_rightLW_currentRowChanged(int item) { if (matchCB->isChecked()) leftLW->setCurrentRow(item); @@ -241,7 +241,7 @@ void QDelimiterDialog::on_rightLW_currentRowChanged(int item) } -void QDelimiterDialog::on_matchCB_stateChanged(int state) +void GuiDelimiterDialog::on_matchCB_stateChanged(int state) { if (state == Qt::Checked) on_leftLW_currentRowChanged(leftLW->currentRow()); @@ -253,4 +253,4 @@ void QDelimiterDialog::on_matchCB_stateChanged(int state) } // namespace frontend } // namespace lyx -#include "QDelimiterDialog_moc.cpp" +#include "GuiDelimiterDialog_moc.cpp" diff --git a/src/frontends/qt4/QDelimiterDialog.h b/src/frontends/qt4/GuiDelimiterDialog.h similarity index 73% rename from src/frontends/qt4/QDelimiterDialog.h rename to src/frontends/qt4/GuiDelimiterDialog.h index 31251553a5..7ad132ccda 100644 --- a/src/frontends/qt4/QDelimiterDialog.h +++ b/src/frontends/qt4/GuiDelimiterDialog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QDelimiterDialog.h + * \file GuiDelimiterDialog.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QDELIMITERDIALOG_H #define QDELIMITERDIALOG_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_DelimiterUi.h" @@ -24,12 +24,12 @@ namespace lyx { namespace frontend { class ControlMath; -class QMathDelimiter; +class GuiMathDelimiter; -class QDelimiterDialog : public QDialog, public Ui::QDelimiterUi { +class GuiDelimiterDialog : public QDialog, public Ui::DelimiterUi { Q_OBJECT public: - QDelimiterDialog(QMathDelimiter * form, QWidget * parent); + GuiDelimiterDialog(GuiMathDelimiter * form, QWidget * parent); public Q_SLOTS: void on_leftLW_itemActivated(QListWidgetItem *); void on_rightLW_itemActivated(QListWidgetItem *); @@ -44,17 +44,17 @@ private: /// void updateTeXCode(int size); /// owning form - QMathDelimiter * form_; + GuiMathDelimiter * form_; /// TeX code that will be inserted. QString tex_code_; }; -class QMathDelimiter : public QController > { +class GuiMathDelimiter : public QController > { public: - friend class QDelimiterDialog; + friend class GuiDelimiterDialog; - QMathDelimiter(Dialog &); + GuiMathDelimiter(Dialog &); private: virtual void apply() {} diff --git a/src/frontends/qt4/QDialogView.cpp b/src/frontends/qt4/GuiDialogView.cpp similarity index 71% rename from src/frontends/qt4/QDialogView.cpp rename to src/frontends/qt4/GuiDialogView.cpp index 57cd67350e..153ef7bb50 100644 --- a/src/frontends/qt4/QDialogView.cpp +++ b/src/frontends/qt4/GuiDialogView.cpp @@ -1,5 +1,5 @@ /** - * \file QDialogView.cpp + * \file GuiDialogView.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QDialogView.h" +#include "GuiDialogView.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -20,30 +20,30 @@ namespace lyx { namespace frontend { -QDialogView::QDialogView(Dialog & parent, docstring const & t) +GuiDialogView::GuiDialogView(Dialog & parent, docstring const & t) : Dialog::View(parent,t), updating_(false) {} -Qt2BC & QDialogView::bcview() +Qt2BC & GuiDialogView::bcview() { return static_cast(dialog().bc().view()); } -bool QDialogView::isVisible() const +bool GuiDialogView::isVisible() const { return form() && form()->isVisible(); } -bool QDialogView::readOnly() const +bool GuiDialogView::readOnly() const { return kernel().isBufferReadonly(); } -void QDialogView::show() +void GuiDialogView::show() { if (!form()) { build(); @@ -70,20 +70,20 @@ void QDialogView::show() } -void QDialogView::hide() +void GuiDialogView::hide() { if (form() && form()->isVisible()) form()->hide(); } -bool QDialogView::isValid() +bool GuiDialogView::isValid() { return true; } -void QDialogView::changed() +void GuiDialogView::changed() { if (updating_) return; @@ -91,31 +91,31 @@ void QDialogView::changed() } -void QDialogView::slotWMHide() +void GuiDialogView::slotWMHide() { dialog().CancelButton(); } -void QDialogView::slotApply() +void GuiDialogView::slotApply() { dialog().ApplyButton(); } -void QDialogView::slotOK() +void GuiDialogView::slotOK() { dialog().OKButton(); } -void QDialogView::slotClose() +void GuiDialogView::slotClose() { dialog().CancelButton(); } -void QDialogView::slotRestore() +void GuiDialogView::slotRestore() { dialog().RestoreButton(); } @@ -123,4 +123,4 @@ void QDialogView::slotRestore() } // namespace frontend } // namespace lyx -#include "QDialogView_moc.cpp" +#include "GuiDialogView_moc.cpp" diff --git a/src/frontends/qt4/QDialogView.h b/src/frontends/qt4/GuiDialogView.h similarity index 89% rename from src/frontends/qt4/QDialogView.h rename to src/frontends/qt4/GuiDialogView.h index 6a91b99d59..861025b307 100644 --- a/src/frontends/qt4/QDialogView.h +++ b/src/frontends/qt4/GuiDialogView.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QDialogView.h + * \file GuiDialogView.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -27,13 +27,13 @@ class Qt2BC; /** This class is an Qt2 GUI base class. */ -class QDialogView : public QObject, public Dialog::View { +class GuiDialogView : public QObject, public Dialog::View { Q_OBJECT public: /// - QDialogView(Dialog &, docstring const &); + GuiDialogView(Dialog &, docstring const &); /// - virtual ~QDialogView() {} + virtual ~GuiDialogView() {} /// bool readOnly() const; @@ -85,12 +85,13 @@ private: template -class QView: public QDialogView { +class GuiView : public GuiDialogView { protected: - QView(Dialog & p, docstring const & t): QDialogView(p, t) + GuiView(Dialog & p, docstring const & t) + : GuiDialogView(p, t) {} - virtual ~QView() {} + virtual ~GuiView() {} /// update the dialog virtual void update() { diff --git a/src/frontends/qt4/QDocument.cpp b/src/frontends/qt4/GuiDocument.cpp similarity index 95% rename from src/frontends/qt4/QDocument.cpp rename to src/frontends/qt4/GuiDocument.cpp index 6087d6b46c..7d882df7d1 100644 --- a/src/frontends/qt4/QDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1,5 +1,5 @@ /** - * \file QDocument.cpp + * \file GuiDocument.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QDocument.h" +#include "GuiDocument.h" #include "CheckedLineEdit.h" #include "FloatPlacement.h" @@ -21,9 +21,9 @@ #include "Validator.h" // For the Branches module -#include "QBranches.h" +#include "GuiBranches.h" -#include "QViewSource.h" // For latexHighlighter use in the preamble. +#include "GuiViewSource.h" // For latexHighlighter use in the preamble. #include "controllers/ControlDocument.h" @@ -175,7 +175,7 @@ void PreambleModule::closeEvent(QCloseEvent * e) // ///////////////////////////////////////////////////////////////////// -QDocumentDialog::QDocumentDialog(QDocument * form) +GuiDocumentDialog::GuiDocumentDialog(GuiDocument * form) : form_(form), lang_(getSecond(getLanguageData(false))) { @@ -557,7 +557,7 @@ QDocumentDialog::QDocumentDialog(QDocument * form) } // branches - branchesModule = new QBranches; + branchesModule = new GuiBranches; connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor())); @@ -599,31 +599,31 @@ QDocumentDialog::QDocumentDialog(QDocument * form) } -void QDocumentDialog::showPreamble() +void GuiDocumentDialog::showPreamble() { docPS->setCurrentPanel(_("LaTeX Preamble")); } -void QDocumentDialog::saveDefaultClicked() +void GuiDocumentDialog::saveDefaultClicked() { form_->saveDocDefault(); } -void QDocumentDialog::useDefaultsClicked() +void GuiDocumentDialog::useDefaultsClicked() { form_->useClassDefaults(); } -void QDocumentDialog::change_adaptor() +void GuiDocumentDialog::change_adaptor() { form_->changed(); } -docstring QDocumentDialog::validate_listings_params() +docstring GuiDocumentDialog::validate_listings_params() { // use a cache here to avoid repeated validation // of the same parameters @@ -642,7 +642,7 @@ docstring QDocumentDialog::validate_listings_params() } -void QDocumentDialog::set_listings_msg() +void GuiDocumentDialog::set_listings_msg() { static bool isOK = true; docstring msg = validate_listings_params(); @@ -661,20 +661,20 @@ void QDocumentDialog::set_listings_msg() } -void QDocumentDialog::closeEvent(QCloseEvent * e) +void GuiDocumentDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QDocumentDialog::setLSpacing(int item) +void GuiDocumentDialog::setLSpacing(int item) { textLayoutModule->lspacingLE->setEnabled(item == 3); } -void QDocumentDialog::setSkip(int item) +void GuiDocumentDialog::setSkip(int item) { bool const enable = (item == 3); textLayoutModule->skipLE->setEnabled(enable); @@ -682,7 +682,7 @@ void QDocumentDialog::setSkip(int item) } -void QDocumentDialog::enableSkip(bool skip) +void GuiDocumentDialog::enableSkip(bool skip) { textLayoutModule->skipCO->setEnabled(skip); textLayoutModule->skipLE->setEnabled(skip); @@ -691,19 +691,19 @@ void QDocumentDialog::enableSkip(bool skip) setSkip(textLayoutModule->skipCO->currentIndex()); } -void QDocumentDialog::portraitChanged() +void GuiDocumentDialog::portraitChanged() { setMargins(pageLayoutModule->papersizeCO->currentIndex()); } -void QDocumentDialog::setMargins(bool custom) +void GuiDocumentDialog::setMargins(bool custom) { marginsModule->marginCB->setChecked(custom); setCustomMargins(custom); } -void QDocumentDialog::setCustomPapersize(int papersize) +void GuiDocumentDialog::setCustomPapersize(int papersize) { bool const custom = (papersize == 1); @@ -717,7 +717,7 @@ void QDocumentDialog::setCustomPapersize(int papersize) } -void QDocumentDialog::setCustomMargins(bool custom) +void GuiDocumentDialog::setCustomMargins(bool custom) { marginsModule->topL->setEnabled(!custom); marginsModule->topLE->setEnabled(!custom); @@ -749,7 +749,7 @@ void QDocumentDialog::setCustomMargins(bool custom) } -void QDocumentDialog::updateFontsize(string const & items, string const & sel) +void GuiDocumentDialog::updateFontsize(string const & items, string const & sel) { fontModule->fontsizeCO->clear(); fontModule->fontsizeCO->addItem(qt_("Default")); @@ -767,7 +767,7 @@ void QDocumentDialog::updateFontsize(string const & items, string const & sel) } -void QDocumentDialog::romanChanged(int item) +void GuiDocumentDialog::romanChanged(int item) { string const font = tex_fonts_roman[item]; @@ -778,7 +778,7 @@ void QDocumentDialog::romanChanged(int item) } -void QDocumentDialog::sansChanged(int item) +void GuiDocumentDialog::sansChanged(int item) { string const font = tex_fonts_sans[item]; bool scaleable = form_->controller().providesScale(font); @@ -787,7 +787,7 @@ void QDocumentDialog::sansChanged(int item) } -void QDocumentDialog::ttChanged(int item) +void GuiDocumentDialog::ttChanged(int item) { string const font = tex_fonts_monospaced[item]; bool scaleable = form_->controller().providesScale(font); @@ -796,7 +796,7 @@ void QDocumentDialog::ttChanged(int item) } -void QDocumentDialog::updatePagestyle(string const & items, string const & sel) +void GuiDocumentDialog::updatePagestyle(string const & items, string const & sel) { pagestyles.clear(); pageLayoutModule->pagestyleCO->clear(); @@ -826,7 +826,7 @@ void QDocumentDialog::updatePagestyle(string const & items, string const & sel) } -void QDocumentDialog::classChanged() +void GuiDocumentDialog::classChanged() { ControlDocument & cntrl = form_->controller(); BufferParams & params = cntrl.params(); @@ -844,7 +844,7 @@ void QDocumentDialog::classChanged() } -void QDocumentDialog::updateNumbering() +void GuiDocumentDialog::updateNumbering() { TextClass const & tclass = form_->controller().params().getTextClass(); @@ -874,7 +874,7 @@ void QDocumentDialog::updateNumbering() numberingModule->tocTW->update(); } -void QDocumentDialog::apply(BufferParams & params) +void GuiDocumentDialog::apply(BufferParams & params) { // preamble preambleModule->apply(params); @@ -1136,7 +1136,7 @@ findPos(std::vector const & vec, A const & val) } // namespace anom -void QDocumentDialog::updateParams(BufferParams const & params) +void GuiDocumentDialog::updateParams(BufferParams const & params) { // set the default unit // FIXME: move to controller @@ -1403,28 +1403,28 @@ void QDocumentDialog::updateParams(BufferParams const & params) // ///////////////////////////////////////////////////////////////////// -typedef QController > +typedef QController > DocumentBase; -QDocument::QDocument(Dialog & parent) +GuiDocument::GuiDocument(Dialog & parent) : DocumentBase(parent, _("Document Settings")) {} -void QDocument::build_dialog() +void GuiDocument::build_dialog() { - dialog_.reset(new QDocumentDialog(this)); + dialog_.reset(new GuiDocumentDialog(this)); } -void QDocument::showPreamble() +void GuiDocument::showPreamble() { dialog_->showPreamble(); } -void QDocument::apply() +void GuiDocument::apply() { if (!dialog_.get()) return; @@ -1433,7 +1433,7 @@ void QDocument::apply() } -void QDocument::update_contents() +void GuiDocument::update_contents() { if (!dialog_.get()) return; @@ -1441,7 +1441,7 @@ void QDocument::update_contents() dialog_->updateParams(controller().params()); } -void QDocument::saveDocDefault() +void GuiDocument::saveDocDefault() { // we have to apply the params first apply(); @@ -1449,7 +1449,7 @@ void QDocument::saveDocDefault() } -void QDocument::useClassDefaults() +void GuiDocument::useClassDefaults() { BufferParams & params = controller().params(); @@ -1460,7 +1460,7 @@ void QDocument::useClassDefaults() } -bool QDocument::isValid() +bool GuiDocument::isValid() { return dialog_->validate_listings_params().empty(); } @@ -1469,4 +1469,4 @@ bool QDocument::isValid() } // namespace frontend } // namespace lyx -#include "QDocument_moc.cpp" +#include "GuiDocument_moc.cpp" diff --git a/src/frontends/qt4/QDocument.h b/src/frontends/qt4/GuiDocument.h similarity index 88% rename from src/frontends/qt4/QDocument.h rename to src/frontends/qt4/GuiDocument.h index 7b4c65a373..b683521479 100644 --- a/src/frontends/qt4/QDocument.h +++ b/src/frontends/qt4/GuiDocument.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QDocument.h + * \file GuiDocument.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QDOCUMENT_H #define QDOCUMENT_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "BulletsModule.h" #include "ui_DocumentUi.h" @@ -50,16 +50,16 @@ public: namespace lyx { namespace frontend { -class QBranches; -class QDocument; +class GuiBranches; +class GuiDocument; class PreambleModule; -class QDocumentDialog : public QDialog, public Ui::QDocumentUi { +class GuiDocumentDialog : public QDialog, public Ui::DocumentUi { Q_OBJECT public: - friend class QDocument; + friend class GuiDocument; - QDocumentDialog(QDocument *); + GuiDocumentDialog(GuiDocument *); void updateParams(BufferParams const & params); void apply(BufferParams & params); @@ -107,12 +107,12 @@ private: UiWidget *latexModule; PreambleModule *preambleModule; - QBranches *branchesModule; + GuiBranches *branchesModule; BulletsModule * bulletsModule; FloatPlacement * floatModule; - QDocument * form_; + GuiDocument * form_; /// FIXME std::vector lang_; @@ -121,14 +121,14 @@ private: class ControlDocument; -class QDocument - : public QController > +class GuiDocument + : public QController > { public: - friend class QDocumentDialog; + friend class GuiDocumentDialog; - QDocument(Dialog &); + GuiDocument(Dialog &); void showPreamble(); diff --git a/src/frontends/qt4/QERT.cpp b/src/frontends/qt4/GuiERT.cpp similarity index 78% rename from src/frontends/qt4/QERT.cpp rename to src/frontends/qt4/GuiERT.cpp index e2160de1a7..66f1fa6ebe 100644 --- a/src/frontends/qt4/QERT.cpp +++ b/src/frontends/qt4/GuiERT.cpp @@ -1,5 +1,5 @@ /** - * \file QERT.cpp + * \file GuiERT.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QERT.h" +#include "GuiERT.h" #include "Qt2BC.h" #include "controllers/ControlERT.h" @@ -25,12 +25,12 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QERTDialog +// GuiERTDialog // ///////////////////////////////////////////////////////////////////// -QERTDialog::QERTDialog(QERT * form) +GuiERTDialog::GuiERTDialog(GuiERT * form) : form_(form) { setupUi(this); @@ -41,14 +41,14 @@ QERTDialog::QERTDialog(QERT * form) } -void QERTDialog::closeEvent(QCloseEvent * e) +void GuiERTDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QERTDialog::change_adaptor() +void GuiERTDialog::change_adaptor() { form_->changed(); } @@ -56,29 +56,29 @@ void QERTDialog::change_adaptor() ///////////////////////////////////////////////////////////////////// // -// QERT +// GuiERT // ///////////////////////////////////////////////////////////////////// -typedef QController > ERTBase; +typedef QController > ERTBase; -QERT::QERT(Dialog & parent) +GuiERT::GuiERT(Dialog & parent) : ERTBase(parent, _("TeX Code Settings")) { } -void QERT::build_dialog() +void GuiERT::build_dialog() { - dialog_.reset(new QERTDialog(this)); + dialog_.reset(new GuiERTDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); } -void QERT::apply() +void GuiERT::apply() { if (dialog_->openRB->isChecked()) controller().setStatus(Inset::Open); @@ -87,7 +87,7 @@ void QERT::apply() } -void QERT::update_contents() +void GuiERT::update_contents() { QRadioButton * rb = 0; @@ -102,4 +102,4 @@ void QERT::update_contents() } // namespace frontend } // namespace lyx -#include "QERT_moc.cpp" +#include "GuiERT_moc.cpp" diff --git a/src/frontends/qt4/QERT.h b/src/frontends/qt4/GuiERT.h similarity index 67% rename from src/frontends/qt4/QERT.h rename to src/frontends/qt4/GuiERT.h index a942c77fda..a7c2628af7 100644 --- a/src/frontends/qt4/QERT.h +++ b/src/frontends/qt4/GuiERT.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QERT.h + * \file GuiERT.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -9,10 +9,10 @@ * Full author contact details are available in file CREDITS. */ -#ifndef QERT_H -#define QERT_H +#ifndef GuiERT_H +#define GuiERT_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_ERTUi.h" #include @@ -21,30 +21,30 @@ namespace lyx { namespace frontend { -class QERT; +class GuiERT; -class QERTDialog : public QDialog, public Ui::QERTUi { +class GuiERTDialog : public QDialog, public Ui::ERTUi { Q_OBJECT public: - QERTDialog(QERT * form); + GuiERTDialog(GuiERT * form); protected Q_SLOTS: virtual void change_adaptor(); protected: virtual void closeEvent(QCloseEvent * e); private: - QERT * form_; + GuiERT * form_; }; class ControlERT; -class QERT : public QController > +class GuiERT : public QController > { public: - friend class QERTDialog; + friend class GuiERTDialog; - QERT(Dialog &); + GuiERT(Dialog &); private: /// Apply changes virtual void apply(); @@ -57,4 +57,4 @@ private: } // namespace frontend } // namespace lyx -#endif // QERT_H +#endif // GuiERT_H diff --git a/src/frontends/qt4/QErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp similarity index 74% rename from src/frontends/qt4/QErrorList.cpp rename to src/frontends/qt4/GuiErrorList.cpp index 4d0816aa53..b0f0f9ef6e 100644 --- a/src/frontends/qt4/QErrorList.cpp +++ b/src/frontends/qt4/GuiErrorList.cpp @@ -1,5 +1,5 @@ /** - * \file QErrorList.cpp + * \file GuiErrorList.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QErrorList.h" +#include "GuiErrorList.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -26,11 +26,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QErrorListDialog +// GuiErrorListDialog // ///////////////////////////////////////////////////////////////////// -QErrorListDialog::QErrorListDialog(QErrorList * form) +GuiErrorListDialog::GuiErrorListDialog(GuiErrorList * form) : form_(form) { setupUi(this); @@ -43,20 +43,20 @@ QErrorListDialog::QErrorListDialog(QErrorList * form) } -void QErrorListDialog::select_adaptor(QListWidgetItem * item) +void GuiErrorListDialog::select_adaptor(QListWidgetItem * item) { form_->select(item); } -void QErrorListDialog::closeEvent(QCloseEvent * e) +void GuiErrorListDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QErrorListDialog::showEvent(QShowEvent *e) +void GuiErrorListDialog::showEvent(QShowEvent *e) { errorsLW->setCurrentRow(0); form_->select(errorsLW->item(0)); @@ -66,27 +66,27 @@ void QErrorListDialog::showEvent(QShowEvent *e) ///////////////////////////////////////////////////////////////////// // -// QErrorList +// GuiErrorList // ///////////////////////////////////////////////////////////////////// -typedef QController > +typedef QController > ErrorListBase; -QErrorList::QErrorList(Dialog & parent) +GuiErrorList::GuiErrorList(Dialog & parent) : ErrorListBase(parent, docstring()) {} -void QErrorList::build_dialog() +void GuiErrorList::build_dialog() { - dialog_.reset(new QErrorListDialog(this)); + dialog_.reset(new GuiErrorListDialog(this)); bcview().setCancel(dialog_->closePB); } -void QErrorList::select(QListWidgetItem * wi) +void GuiErrorList::select(QListWidgetItem * wi) { int const item = dialog_->errorsLW->row(wi); controller().goTo(item); @@ -94,7 +94,7 @@ void QErrorList::select(QListWidgetItem * wi) } -void QErrorList::update_contents() +void GuiErrorList::update_contents() { setTitle(from_utf8(controller().name())); dialog_->errorsLW->clear(); @@ -111,4 +111,4 @@ void QErrorList::update_contents() } // namespace lyx -#include "QErrorList_moc.cpp" +#include "GuiErrorList_moc.cpp" diff --git a/src/frontends/qt4/QErrorList.h b/src/frontends/qt4/GuiErrorList.h similarity index 71% rename from src/frontends/qt4/QErrorList.h rename to src/frontends/qt4/GuiErrorList.h index d998c3f8fd..ec3ef9496d 100644 --- a/src/frontends/qt4/QErrorList.h +++ b/src/frontends/qt4/GuiErrorList.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QErrorList.h + * \file GuiErrorList.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QERRORLIST_H #define QERRORLIST_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_ErrorListUi.h" #include @@ -24,12 +24,12 @@ class QShowEvent; namespace lyx { namespace frontend { -class QErrorList; +class GuiErrorList; -class QErrorListDialog : public QDialog, public Ui::QErrorListUi { +class GuiErrorListDialog : public QDialog, public Ui::ErrorListUi { Q_OBJECT public: - QErrorListDialog(QErrorList * form); + GuiErrorListDialog(GuiErrorList * form); public Q_SLOTS: void select_adaptor(QListWidgetItem *); @@ -37,19 +37,19 @@ protected: void closeEvent(QCloseEvent *); void showEvent(QShowEvent *); private: - QErrorList * form_; + GuiErrorList * form_; }; class ControlErrorList; -class QErrorList : - public QController > +class GuiErrorList : + public QController > { public: - friend class QErrorListDialog; + friend class GuiErrorListDialog; - QErrorList(Dialog &); + GuiErrorList(Dialog &); private: /// select an entry void select(QListWidgetItem *); diff --git a/src/frontends/qt4/QExternal.cpp b/src/frontends/qt4/GuiExternal.cpp similarity index 94% rename from src/frontends/qt4/QExternal.cpp rename to src/frontends/qt4/GuiExternal.cpp index 0757d9fca8..19cb852a96 100644 --- a/src/frontends/qt4/QExternal.cpp +++ b/src/frontends/qt4/GuiExternal.cpp @@ -1,5 +1,5 @@ /** - * \file QExternal.cpp + * \file GuiExternal.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -27,7 +27,7 @@ #include "support/os.h" #include "support/lyxlib.h" -#include "QExternal.h" +#include "GuiExternal.h" #include "Qt2BC.h" #include "CheckedLineEdit.h" @@ -60,12 +60,12 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QExternalDialog +// GuiExternalDialog // ///////////////////////////////////////////////////////////////////// -QExternalDialog::QExternalDialog(QExternal * form) +GuiExternalDialog::GuiExternalDialog(GuiExternal * form) : form_(form) { setupUi(this); @@ -136,14 +136,14 @@ QExternalDialog::QExternalDialog(QExternal * form) } -void QExternalDialog::show() +void GuiExternalDialog::show() { QDialog::show(); } -bool QExternalDialog::activateAspectratio() const +bool GuiExternalDialog::activateAspectratio() const { if (widthUnitCO->currentIndex() == 0) return false; @@ -171,14 +171,14 @@ bool QExternalDialog::activateAspectratio() const } -void QExternalDialog::bbChanged() +void GuiExternalDialog::bbChanged() { form_->controller().bbChanged(true); form_->changed(); } -void QExternalDialog::browseClicked() +void GuiExternalDialog::browseClicked() { int const choice = externalCO->currentIndex(); docstring const template_name = @@ -193,27 +193,27 @@ void QExternalDialog::browseClicked() } -void QExternalDialog::change_adaptor() +void GuiExternalDialog::change_adaptor() { form_->changed(); } -void QExternalDialog::closeEvent(QCloseEvent * e) +void GuiExternalDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QExternalDialog::editClicked() +void GuiExternalDialog::editClicked() { form_->controller().editExternal(); } -void QExternalDialog::extraChanged(const QString& text) +void GuiExternalDialog::extraChanged(const QString& text) { std::string const format = fromqstr(extraFormatCO->currentText()); form_->extra_[format] = text; @@ -221,33 +221,33 @@ void QExternalDialog::extraChanged(const QString& text) } -void QExternalDialog::formatChanged(const QString& format) +void GuiExternalDialog::formatChanged(const QString& format) { extraED->setText(form_->extra_[fromqstr(format)]); } -void QExternalDialog::getbbClicked() +void GuiExternalDialog::getbbClicked() { form_->getBB(); } -void QExternalDialog::sizeChanged() +void GuiExternalDialog::sizeChanged() { aspectratioCB->setEnabled(activateAspectratio()); form_->changed(); } -void QExternalDialog::templateChanged() +void GuiExternalDialog::templateChanged() { form_->updateTemplate(); form_->changed(); } -void QExternalDialog::widthUnitChanged() +void GuiExternalDialog::widthUnitChanged() { bool useHeight = (widthUnitCO->currentIndex() > 0); @@ -264,7 +264,7 @@ void QExternalDialog::widthUnitChanged() ///////////////////////////////////////////////////////////////////// // -// QExternal +// GuiExternal // ///////////////////////////////////////////////////////////////////// @@ -477,9 +477,9 @@ void getCrop(external::ClipData & data, void getExtra(external::ExtraData & data, - QExternal::MapType const & extra) + GuiExternal::MapType const & extra) { - typedef QExternal::MapType MapType; + typedef GuiExternal::MapType MapType; MapType::const_iterator it = extra.begin(); MapType::const_iterator const end = extra.end(); for (; it != end; ++it) @@ -489,17 +489,17 @@ void getExtra(external::ExtraData & data, } // namespace anon -typedef QController > +typedef QController > ExternalBase; -QExternal::QExternal(Dialog & parent) +GuiExternal::GuiExternal(Dialog & parent) : ExternalBase(parent, _("External Material")) {} -void QExternal::build_dialog() +void GuiExternal::build_dialog() { - dialog_.reset(new QExternalDialog(this)); + dialog_.reset(new GuiExternalDialog(this)); bcview().setOK(dialog_->okPB); bcview().setApply(dialog_->applyPB); @@ -559,7 +559,7 @@ void QExternal::build_dialog() } -void QExternal::update_contents() +void GuiExternal::update_contents() { dialog_->tab->setCurrentIndex(0); InsetExternalParams const & params = controller().params(); @@ -595,7 +595,7 @@ void QExternal::update_contents() } -void QExternal::updateTemplate() +void GuiExternal::updateTemplate() { external::Template templ = controller().getTemplate(dialog_->externalCO->currentIndex()); @@ -661,7 +661,7 @@ void QExternal::updateTemplate() } -void QExternal::apply() +void GuiExternal::apply() { InsetExternalParams params = controller().params(); @@ -705,7 +705,7 @@ void QExternal::apply() } -void QExternal::getBB() +void GuiExternal::getBB() { dialog_->xlED->setText("0"); dialog_->ybED->setText("0"); @@ -731,4 +731,4 @@ void QExternal::getBB() } // namespace frontend } // namespace lyx -#include "QExternal_moc.cpp" +#include "GuiExternal_moc.cpp" diff --git a/src/frontends/qt4/QExternal.h b/src/frontends/qt4/GuiExternal.h similarity index 79% rename from src/frontends/qt4/QExternal.h rename to src/frontends/qt4/GuiExternal.h index 51c933d535..dcf2c3d4a8 100644 --- a/src/frontends/qt4/QExternal.h +++ b/src/frontends/qt4/GuiExternal.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QExternal.h + * \file GuiExternal.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QEXTERNAL_H #define QEXTERNAL_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_ExternalUi.h" @@ -24,12 +24,12 @@ namespace lyx { namespace frontend { -class QExternal; +class GuiExternal; -class QExternalDialog : public QDialog, public Ui::QExternalUi { +class GuiExternalDialog : public QDialog, public Ui::ExternalUi { Q_OBJECT public: - QExternalDialog(QExternal * form); + GuiExternalDialog(GuiExternal * form); virtual void show(); protected Q_SLOTS: @@ -48,19 +48,19 @@ protected: virtual void closeEvent(QCloseEvent * e); private: bool activateAspectratio() const; - QExternal * form_; + GuiExternal * form_; }; class ControlExternal; -class QExternal - : public QController > +class GuiExternal + : public QController > { public: - friend class QExternalDialog; + friend class GuiExternalDialog; - QExternal(Dialog &); + GuiExternal(Dialog &); typedef std::map MapType; diff --git a/src/frontends/qt4/QFloat.cpp b/src/frontends/qt4/GuiFloat.cpp similarity index 73% rename from src/frontends/qt4/QFloat.cpp rename to src/frontends/qt4/GuiFloat.cpp index c3e2c14a62..a29df99728 100644 --- a/src/frontends/qt4/QFloat.cpp +++ b/src/frontends/qt4/GuiFloat.cpp @@ -1,5 +1,5 @@ /** - * \file QFloat.cpp + * \file GuiFloat.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "QFloat.h" -#include "QFloatDialog.h" +#include "GuiFloat.h" +#include "GuiFloatDialog.h" #include "Qt2BC.h" #include "FloatPlacement.h" @@ -24,18 +24,18 @@ namespace lyx { namespace frontend { -typedef QController > float_base_class; +typedef QController > float_base_class; -QFloat::QFloat(Dialog & parent) +GuiFloat::GuiFloat(Dialog & parent) : float_base_class(parent, _("Float Settings")) { } -void QFloat::build_dialog() +void GuiFloat::build_dialog() { - dialog_.reset(new QFloatDialog(this)); + dialog_.reset(new GuiFloatDialog(this)); bcview().setCancel(dialog_->closePB); bcview().setApply(dialog_->applyPB); @@ -46,13 +46,13 @@ void QFloat::build_dialog() } -void QFloat::update_contents() +void GuiFloat::update_contents() { dialog_->floatFP->set(controller().params()); } -void QFloat::apply() +void GuiFloat::apply() { InsetFloatParams & params = controller().params(); diff --git a/src/frontends/qt4/QFloat.h b/src/frontends/qt4/GuiFloat.h similarity index 73% rename from src/frontends/qt4/QFloat.h rename to src/frontends/qt4/GuiFloat.h index 4abebef67a..64a84ae246 100644 --- a/src/frontends/qt4/QFloat.h +++ b/src/frontends/qt4/GuiFloat.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QFloat.h + * \file GuiFloat.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,8 +12,8 @@ #ifndef QFLOAT_H #define QFLOAT_H -#include "QDialogView.h" -#include "QFloatDialog.h" +#include "GuiDialogView.h" +#include "GuiFloatDialog.h" namespace lyx { namespace frontend { @@ -22,12 +22,12 @@ namespace frontend { class ControlFloat; /// -class QFloat : public QController > { +class GuiFloat : public QController > { public: /// - friend class QFloatDialog; + friend class GuiFloatDialog; /// - QFloat(Dialog &); + GuiFloat(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QFloatDialog.cpp b/src/frontends/qt4/GuiFloatDialog.cpp similarity index 79% rename from src/frontends/qt4/QFloatDialog.cpp rename to src/frontends/qt4/GuiFloatDialog.cpp index c32ba45290..3a8b4f2157 100644 --- a/src/frontends/qt4/QFloatDialog.cpp +++ b/src/frontends/qt4/GuiFloatDialog.cpp @@ -1,5 +1,5 @@ /** - * \file QFloatDialog.cpp + * \file GuiFloatDialog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "QFloatDialog.h" -#include "QFloat.h" +#include "GuiFloatDialog.h" +#include "GuiFloat.h" #include #include @@ -23,7 +23,7 @@ namespace lyx { namespace frontend { -QFloatDialog::QFloatDialog(QFloat * form) +GuiFloatDialog::GuiFloatDialog(GuiFloat * form) : form_(form) { setupUi(this); @@ -47,13 +47,13 @@ QFloatDialog::QFloatDialog(QFloat * form) } -void QFloatDialog::change_adaptor() +void GuiFloatDialog::change_adaptor() { form_->changed(); } -void QFloatDialog::closeEvent(QCloseEvent * e) +void GuiFloatDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); @@ -62,4 +62,4 @@ void QFloatDialog::closeEvent(QCloseEvent * e) } // namespace frontend } // namespace lyx -#include "QFloatDialog_moc.cpp" +#include "GuiFloatDialog_moc.cpp" diff --git a/src/frontends/qt4/QFloatDialog.h b/src/frontends/qt4/GuiFloatDialog.h similarity index 79% rename from src/frontends/qt4/QFloatDialog.h rename to src/frontends/qt4/GuiFloatDialog.h index 8a203c076a..1dc3c6a84e 100644 --- a/src/frontends/qt4/QFloatDialog.h +++ b/src/frontends/qt4/GuiFloatDialog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QFloatDialog.h + * \file GuiFloatDialog.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -20,12 +20,12 @@ namespace lyx { namespace frontend { -class QFloat; +class GuiFloat; -class QFloatDialog : public QDialog, public Ui::QFloatUi { +class GuiFloatDialog : public QDialog, public Ui::FloatUi { Q_OBJECT public: - QFloatDialog(QFloat * form); + GuiFloatDialog(GuiFloat * form); protected Q_SLOTS: virtual void change_adaptor(); @@ -34,7 +34,7 @@ protected: virtual void closeEvent(QCloseEvent * e); private: - QFloat * form_; + GuiFloat * form_; }; } // namespace frontend diff --git a/src/frontends/qt4/QFontExample.cpp b/src/frontends/qt4/GuiFontExample.cpp similarity index 75% rename from src/frontends/qt4/QFontExample.cpp rename to src/frontends/qt4/GuiFontExample.cpp index 7ffffbd09f..cb27b5fb5a 100644 --- a/src/frontends/qt4/QFontExample.cpp +++ b/src/frontends/qt4/GuiFontExample.cpp @@ -1,5 +1,5 @@ /** - * \file QFontExample.cpp + * \file GuiFontExample.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QFontExample.h" +#include "GuiFontExample.h" #include #include @@ -18,7 +18,7 @@ //namespace lyx { -void QFontExample::set(QFont const & font, QString const & text) +void GuiFontExample::set(QFont const & font, QString const & text) { font_ = font; text_ = text; @@ -26,14 +26,14 @@ void QFontExample::set(QFont const & font, QString const & text) } -QSize QFontExample::sizeHint() const +QSize GuiFontExample::sizeHint() const { QFontMetrics m(font_); return QSize(m.width(text_) + 10, m.ascent() + m.descent() + 6); } -void QFontExample::paintEvent(QPaintEvent *) +void GuiFontExample::paintEvent(QPaintEvent *) { QPainter p; QFontMetrics m(font_); diff --git a/src/frontends/qt4/QFontExample.h b/src/frontends/qt4/GuiFontExample.h similarity index 86% rename from src/frontends/qt4/QFontExample.h rename to src/frontends/qt4/GuiFontExample.h index 650c6fafa6..a23f4d0b49 100644 --- a/src/frontends/qt4/QFontExample.h +++ b/src/frontends/qt4/GuiFontExample.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QFontExample.h + * \file GuiFontExample.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -21,10 +21,10 @@ class QPaintEvent; //namespace lyx { -class QFontExample : public QWidget { +class GuiFontExample : public QWidget { public: - QFontExample(QWidget * parent) + GuiFontExample(QWidget * parent) : QWidget(parent) {} void set(QFont const & font, QString const & text); diff --git a/src/frontends/qt4/QGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp similarity index 96% rename from src/frontends/qt4/QGraphics.cpp rename to src/frontends/qt4/GuiGraphics.cpp index 3e6e6bf405..da7a7888b4 100644 --- a/src/frontends/qt4/QGraphics.cpp +++ b/src/frontends/qt4/GuiGraphics.cpp @@ -1,5 +1,5 @@ /** - * \file QGraphics.cpp + * \file GuiGraphics.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,11 +13,11 @@ #include -#include "QGraphics.h" +#include "GuiGraphics.h" #include "CheckedLineEdit.h" #include "LengthCombo.h" -#include "QGraphicsDialog.h" +#include "GuiGraphicsDialog.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -56,17 +56,17 @@ using std::string; namespace lyx { namespace frontend { -typedef QController > graphics_base_class; +typedef QController > graphics_base_class; -QGraphics::QGraphics(Dialog & parent) +GuiGraphics::GuiGraphics(Dialog & parent) : graphics_base_class(parent, _("Graphics")) { } -void QGraphics::build_dialog() +void GuiGraphics::build_dialog() { - dialog_.reset(new QGraphicsDialog(this)); + dialog_.reset(new GuiGraphicsDialog(this)); bcview().setOK(dialog_->okPB); bcview().setApply(dialog_->applyPB); @@ -116,7 +116,7 @@ int getItemNo(vector v, string const & s) { } -void QGraphics::update_contents() +void GuiGraphics::update_contents() { // clear and fill in the comboboxes vector const bb_units = frontend::getBBUnits(); @@ -271,7 +271,7 @@ void QGraphics::update_contents() vector origindata = getRotationOriginData(); vector const origin_lang = getFirst(origindata); - QGraphics::origin_ltx = getSecond(origindata); + GuiGraphics::origin_ltx = getSecond(origindata); for (vector::const_iterator it = origin_lang.begin(); it != origin_lang.end(); ++it) @@ -291,7 +291,7 @@ void QGraphics::update_contents() } -void QGraphics::apply() +void GuiGraphics::apply() { InsetGraphicsParams & igp = controller().params(); @@ -382,7 +382,7 @@ void QGraphics::apply() // save the latex name for the origin. If it is the default // then origin_ltx returns "" igp.rotateOrigin = - QGraphics::origin_ltx[dialog_->origin->currentIndex()]; + GuiGraphics::origin_ltx[dialog_->origin->currentIndex()]; igp.scaleBeforeRotation = dialog_->rotateOrderCB->isChecked(); @@ -391,7 +391,7 @@ void QGraphics::apply() } -void QGraphics::getBB() +void GuiGraphics::getBB() { string const filename(fromqstr(dialog_->filename->text())); if (!filename.empty()) { @@ -413,7 +413,7 @@ void QGraphics::getBB() } -bool QGraphics::isValid() +bool GuiGraphics::isValid() { return !dialog_->filename->text().isEmpty(); } diff --git a/src/frontends/qt4/QGraphics.h b/src/frontends/qt4/GuiGraphics.h similarity index 77% rename from src/frontends/qt4/QGraphics.h rename to src/frontends/qt4/GuiGraphics.h index 48f7b51018..45744ae38e 100644 --- a/src/frontends/qt4/QGraphics.h +++ b/src/frontends/qt4/GuiGraphics.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QGraphics.h + * \file GuiGraphics.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,8 +13,8 @@ #ifndef QGRAPHICS_H #define QGRAPHICS_H -#include "QDialogView.h" -#include "QGraphicsDialog.h" +#include "GuiDialogView.h" +#include "GuiGraphicsDialog.h" #include @@ -24,14 +24,14 @@ namespace frontend { class ControlGraphics; /// -class QGraphics - : public QController > +class GuiGraphics + : public QController > { public: /// - friend class QGraphicsDialog; + friend class GuiGraphicsDialog; /// - QGraphics(Dialog &); + GuiGraphics(Dialog &); protected: virtual bool isValid(); private: diff --git a/src/frontends/qt4/QGraphicsDialog.cpp b/src/frontends/qt4/GuiGraphicsDialog.cpp similarity index 90% rename from src/frontends/qt4/QGraphicsDialog.cpp rename to src/frontends/qt4/GuiGraphicsDialog.cpp index ba801d4df8..70f8e79cf5 100644 --- a/src/frontends/qt4/QGraphicsDialog.cpp +++ b/src/frontends/qt4/GuiGraphicsDialog.cpp @@ -1,5 +1,5 @@ /** - * \file QGraphicsDialog.cpp + * \file GuiGraphicsDialog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,8 +13,8 @@ #include -#include "QGraphicsDialog.h" -#include "QGraphics.h" +#include "GuiGraphicsDialog.h" +#include "GuiGraphics.h" #include "LengthCombo.h" #include "Validator.h" @@ -38,7 +38,7 @@ namespace lyx { namespace frontend { -QGraphicsDialog::QGraphicsDialog(QGraphics * form) +GuiGraphicsDialog::GuiGraphicsDialog(GuiGraphics * form) : form_(form) { setupUi(this); @@ -146,19 +146,19 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form) } -void QGraphicsDialog::show() +void GuiGraphicsDialog::show() { QDialog::show(); } -void QGraphicsDialog::change_adaptor() +void GuiGraphicsDialog::change_adaptor() { form_->changed(); } -void QGraphicsDialog::change_bb() +void GuiGraphicsDialog::change_bb() { form_->controller().bbChanged = true; LYXERR(Debug::GRAPHICS) @@ -167,14 +167,14 @@ void QGraphicsDialog::change_bb() } -void QGraphicsDialog::closeEvent(QCloseEvent * e) +void GuiGraphicsDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QGraphicsDialog::on_browsePB_clicked() +void GuiGraphicsDialog::on_browsePB_clicked() { docstring const str = form_->controller().browse(qstring_to_ucs4(filename->text())); @@ -185,25 +185,25 @@ void QGraphicsDialog::on_browsePB_clicked() } -void QGraphicsDialog::on_getPB_clicked() +void GuiGraphicsDialog::on_getPB_clicked() { form_->getBB(); } -void QGraphicsDialog::on_editPB_clicked() +void GuiGraphicsDialog::on_editPB_clicked() { form_->controller().editGraphics(); } -void QGraphicsDialog::on_filename_textChanged(const QString & filename) +void GuiGraphicsDialog::on_filename_textChanged(const QString & filename) { editPB->setDisabled(filename.isEmpty()); } -void QGraphicsDialog::setAutoText() +void GuiGraphicsDialog::setAutoText() { if (scaleCB->isChecked()) return; if (!Scale->isEnabled() && Scale->text() != "100") @@ -214,7 +214,7 @@ void QGraphicsDialog::setAutoText() } -void QGraphicsDialog::on_scaleCB_toggled(bool setScale) +void GuiGraphicsDialog::on_scaleCB_toggled(bool setScale) { Scale->setEnabled(setScale); if (setScale) { @@ -247,7 +247,7 @@ void QGraphicsDialog::on_scaleCB_toggled(bool setScale) setAutoText(); } -void QGraphicsDialog::on_WidthCB_toggled(bool setWidth) +void GuiGraphicsDialog::on_WidthCB_toggled(bool setWidth) { Width->setEnabled(setWidth); widthUnit->setEnabled(setWidth); @@ -271,7 +271,7 @@ void QGraphicsDialog::on_WidthCB_toggled(bool setWidth) setAutoText(); } -void QGraphicsDialog::on_HeightCB_toggled(bool setHeight) +void GuiGraphicsDialog::on_HeightCB_toggled(bool setHeight) { Height->setEnabled(setHeight); heightUnit->setEnabled(setHeight); @@ -296,7 +296,7 @@ void QGraphicsDialog::on_HeightCB_toggled(bool setHeight) } -void QGraphicsDialog::on_angle_textChanged(const QString & filename) +void GuiGraphicsDialog::on_angle_textChanged(const QString & filename) { rotateOrderCB->setEnabled((WidthCB->isChecked() || HeightCB->isChecked() || @@ -308,4 +308,4 @@ void QGraphicsDialog::on_angle_textChanged(const QString & filename) } // namespace frontend } // namespace lyx -#include "QGraphicsDialog_moc.cpp" +#include "GuiGraphicsDialog_moc.cpp" diff --git a/src/frontends/qt4/QGraphicsDialog.h b/src/frontends/qt4/GuiGraphicsDialog.h similarity index 85% rename from src/frontends/qt4/QGraphicsDialog.h rename to src/frontends/qt4/GuiGraphicsDialog.h index f1da0671a8..6bface03a6 100644 --- a/src/frontends/qt4/QGraphicsDialog.h +++ b/src/frontends/qt4/GuiGraphicsDialog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QGraphicsDialog.h + * \file GuiGraphicsDialog.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -23,12 +23,12 @@ namespace lyx { namespace frontend { -class QGraphics; +class GuiGraphics; -class QGraphicsDialog : public QDialog, public Ui::QGraphicsUi { +class GuiGraphicsDialog : public QDialog, public Ui::GraphicsUi { Q_OBJECT public: - QGraphicsDialog(QGraphics * form); + GuiGraphicsDialog(GuiGraphics * form); virtual void setAutoText(); virtual void show(); protected Q_SLOTS: @@ -45,7 +45,7 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QGraphics * form_; + GuiGraphics * form_; }; } // namespace frontend diff --git a/src/frontends/qt4/QGraphicsUi.h b/src/frontends/qt4/GuiGraphicsUi.h similarity index 100% rename from src/frontends/qt4/QGraphicsUi.h rename to src/frontends/qt4/GuiGraphicsUi.h diff --git a/src/frontends/qt4/QLImage.cpp b/src/frontends/qt4/GuiImage.cpp similarity index 99% rename from src/frontends/qt4/QLImage.cpp rename to src/frontends/qt4/GuiImage.cpp index f21564e212..51eb3cf6f7 100644 --- a/src/frontends/qt4/QLImage.cpp +++ b/src/frontends/qt4/GuiImage.cpp @@ -1,5 +1,5 @@ /** - * \file QLImage.cpp + * \file GuiImage.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QLImage.h" +#include "GuiImage.h" #include "qt_helpers.h" #include "debug.h" diff --git a/src/frontends/qt4/QLImage.h b/src/frontends/qt4/GuiImage.h similarity index 99% rename from src/frontends/qt4/QLImage.h rename to src/frontends/qt4/GuiImage.h index ddffd77c91..57cc49e689 100644 --- a/src/frontends/qt4/QLImage.h +++ b/src/frontends/qt4/GuiImage.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QLImage.h + * \file GuiImage.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/GuiImplementation.cpp b/src/frontends/qt4/GuiImplementation.cpp index 99c2871186..344f7954ca 100644 --- a/src/frontends/qt4/GuiImplementation.cpp +++ b/src/frontends/qt4/GuiImplementation.cpp @@ -48,7 +48,7 @@ LyXView& GuiImplementation::createRegisteredView() int id = 0; while (views_.find(id) != views_.end()) id++; - views_.insert(std::pair(id, new GuiView(id))); + views_.insert(std::pair(id, new GuiViewBase(id))); updateIds(views_, view_ids_); return *views_[id]; } @@ -60,7 +60,7 @@ bool GuiImplementation::unregisterView(int id) BOOST_ASSERT(views_.find(id) != views_.end()); BOOST_ASSERT(views_[id]); - std::map::iterator it; + std::map::iterator it; for (it = views_.begin(); it != views_.end(); ++it) { if (it->first == id) { views_.erase(id); @@ -82,8 +82,8 @@ bool GuiImplementation::closeAllViews() return true; } - std::map const cmap = views_; - std::map::const_iterator it; + std::map const cmap = views_; + std::map::const_iterator it; for (it = cmap.begin(); it != cmap.end(); ++it) { // TODO: return false when close event was ignored diff --git a/src/frontends/qt4/GuiImplementation.h b/src/frontends/qt4/GuiImplementation.h index 08b22589e5..cf6c16b5e2 100644 --- a/src/frontends/qt4/GuiImplementation.h +++ b/src/frontends/qt4/GuiImplementation.h @@ -22,13 +22,13 @@ namespace lyx { namespace frontend { -class GuiView; +class GuiViewBase; class LyXView; /** * The GuiImplementation class is the interface to all Qt4 components. */ -class GuiImplementation: public QObject, public Gui +class GuiImplementation : public QObject, public Gui { Q_OBJECT @@ -51,7 +51,7 @@ private: * object is handled by Qt when the view is closed * \sa Qt::WA_DeleteOnClose attribute. */ - std::map views_; + std::map views_; }; } // namespace frontend diff --git a/src/frontends/qt4/QInclude.cpp b/src/frontends/qt4/GuiInclude.cpp similarity index 91% rename from src/frontends/qt4/QInclude.cpp rename to src/frontends/qt4/GuiInclude.cpp index d82284583d..38b56befca 100644 --- a/src/frontends/qt4/QInclude.cpp +++ b/src/frontends/qt4/GuiInclude.cpp @@ -1,5 +1,5 @@ /** - * \file QInclude.cpp + * \file GuiInclude.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #include "support/os.h" #include "support/lstrings.h" -#include "QInclude.h" +#include "GuiInclude.h" #include "CheckedLineEdit.h" #include "Qt2BC.h" @@ -42,11 +42,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QIncludeDialog +// GuiIncludeDialog // ///////////////////////////////////////////////////////////////////// -QIncludeDialog::QIncludeDialog(QInclude * form) +GuiIncludeDialog::GuiIncludeDialog(GuiInclude * form) : form_(form) { setupUi(this); @@ -72,19 +72,19 @@ QIncludeDialog::QIncludeDialog(QInclude * form) } -void QIncludeDialog::show() +void GuiIncludeDialog::show() { QDialog::show(); } -void QIncludeDialog::change_adaptor() +void GuiIncludeDialog::change_adaptor() { form_->changed(); } -docstring QIncludeDialog::validate_listings_params() +docstring GuiIncludeDialog::validate_listings_params() { // use a cache here to avoid repeated validation // of the same parameters @@ -103,7 +103,7 @@ docstring QIncludeDialog::validate_listings_params() } -void QIncludeDialog::set_listings_msg() +void GuiIncludeDialog::set_listings_msg() { static bool isOK = true; docstring msg = validate_listings_params(); @@ -120,14 +120,14 @@ void QIncludeDialog::set_listings_msg() } -void QIncludeDialog::closeEvent(QCloseEvent * e) +void GuiIncludeDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QIncludeDialog::typeChanged(int v) +void GuiIncludeDialog::typeChanged(int v) { switch (v) { //case Include @@ -168,13 +168,13 @@ void QIncludeDialog::typeChanged(int v) } -void QIncludeDialog::editClicked() +void GuiIncludeDialog::editClicked() { form_->edit(); } -void QIncludeDialog::browseClicked() +void GuiIncludeDialog::browseClicked() { form_->browse(); } @@ -182,22 +182,22 @@ void QIncludeDialog::browseClicked() ///////////////////////////////////////////////////////////////////// // -// QInclude +// GuiInclude // ///////////////////////////////////////////////////////////////////// -typedef QController > IncludeBase; +typedef QController > IncludeBase; -QInclude::QInclude(Dialog & parent) +GuiInclude::GuiInclude(Dialog & parent) : IncludeBase(parent, _("Child Document")) {} -void QInclude::build_dialog() +void GuiInclude::build_dialog() { - dialog_.reset(new QIncludeDialog(this)); + dialog_.reset(new GuiIncludeDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); @@ -211,7 +211,7 @@ void QInclude::build_dialog() } -void QInclude::update_contents() +void GuiInclude::update_contents() { InsetCommandParams const & params = controller().params(); @@ -282,7 +282,7 @@ void QInclude::update_contents() } -void QInclude::apply() +void GuiInclude::apply() { InsetCommandParams params = controller().params(); @@ -315,7 +315,7 @@ void QInclude::apply() } -void QInclude::browse() +void GuiInclude::browse() { ControlInclude::Type type; @@ -336,7 +336,7 @@ void QInclude::browse() } -void QInclude::edit() +void GuiInclude::edit() { if (isValid()) { string const file = fromqstr(dialog_->filenameED->text()); @@ -346,7 +346,7 @@ void QInclude::edit() } -bool QInclude::isValid() +bool GuiInclude::isValid() { return !dialog_->filenameED->text().isEmpty() && dialog_->validate_listings_params().empty(); @@ -355,4 +355,4 @@ bool QInclude::isValid() } // namespace frontend } // namespace lyx -#include "QInclude_moc.cpp" +#include "GuiInclude_moc.cpp" diff --git a/src/frontends/qt4/QInclude.h b/src/frontends/qt4/GuiInclude.h similarity index 81% rename from src/frontends/qt4/QInclude.h rename to src/frontends/qt4/GuiInclude.h index 8e879fc7eb..d961650028 100644 --- a/src/frontends/qt4/QInclude.h +++ b/src/frontends/qt4/GuiInclude.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QInclude.h + * \file GuiInclude.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QINCLUDE_H #define QINCLUDE_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_IncludeUi.h" @@ -21,12 +21,12 @@ namespace lyx { namespace frontend { -class QInclude; +class GuiInclude; -class QIncludeDialog : public QDialog, public Ui::QIncludeUi { +class GuiIncludeDialog : public QDialog, public Ui::IncludeUi { Q_OBJECT public: - QIncludeDialog(QInclude * form); + GuiIncludeDialog(GuiInclude * form); void updateLists(); @@ -46,20 +46,20 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QInclude * form_; + GuiInclude * form_; }; class ControlInclude; /// -class QInclude : public QController > +class GuiInclude : public QController > { public: /// - friend class QIncludeDialog; + friend class GuiIncludeDialog; /// - QInclude(Dialog &); + GuiInclude(Dialog &); protected: virtual bool isValid(); private: diff --git a/src/frontends/qt4/QIndex.cpp b/src/frontends/qt4/GuiIndex.cpp similarity index 78% rename from src/frontends/qt4/QIndex.cpp rename to src/frontends/qt4/GuiIndex.cpp index 4fdaaa38f4..c9e114d948 100644 --- a/src/frontends/qt4/QIndex.cpp +++ b/src/frontends/qt4/GuiIndex.cpp @@ -1,5 +1,5 @@ /** - * \file QIndex.cpp + * \file GuiIndex.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #include "ControlCommand.h" #include "qt_helpers.h" -#include "QIndex.h" +#include "GuiIndex.h" #include "Qt2BC.h" #include "ButtonController.h" @@ -29,14 +29,14 @@ using std::string; ///////////////////////////////////////////////////////////////////// // -// QIndexDialog +// GuiIndexDialog // ///////////////////////////////////////////////////////////////////// namespace lyx { namespace frontend { -QIndexDialog::QIndexDialog(QIndex * form) +GuiIndexDialog::GuiIndexDialog(GuiIndex * form) : form_(form) { setupUi(this); @@ -66,19 +66,19 @@ QIndexDialog::QIndexDialog(QIndex * form) } -void QIndexDialog::change_adaptor() +void GuiIndexDialog::change_adaptor() { form_->changed(); } -void QIndexDialog::reject() +void GuiIndexDialog::reject() { form_->slotClose(); } -void QIndexDialog::closeEvent(QCloseEvent * e) +void GuiIndexDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); @@ -87,22 +87,22 @@ void QIndexDialog::closeEvent(QCloseEvent * e) ///////////////////////////////////////////////////////////////////// // -// QIndex +// GuiIndex // ///////////////////////////////////////////////////////////////////// -typedef QController > IndexBase; +typedef QController > IndexBase; -QIndex::QIndex(Dialog & parent, docstring const & title, QString const & label) +GuiIndex::GuiIndex(Dialog & parent, docstring const & title, QString const & label) : IndexBase(parent, title), label_(label) { } -void QIndex::build_dialog() +void GuiIndex::build_dialog() { - dialog_.reset(new QIndexDialog(this)); + dialog_.reset(new GuiIndexDialog(this)); dialog_->keywordLA->setText(label_); @@ -112,7 +112,7 @@ void QIndex::build_dialog() } -void QIndex::update_contents() +void GuiIndex::update_contents() { docstring const contents = controller().params()["name"]; dialog_->keywordED->setText(toqstr(contents)); @@ -121,13 +121,13 @@ void QIndex::update_contents() } -void QIndex::apply() +void GuiIndex::apply() { controller().params()["name"] = qstring_to_ucs4(dialog_->keywordED->text()); } -bool QIndex::isValid() +bool GuiIndex::isValid() { return !dialog_->keywordED->text().isEmpty(); } @@ -135,4 +135,4 @@ bool QIndex::isValid() } // namespace frontend } // namespace lyx -#include "QIndex_moc.cpp" +#include "GuiIndex_moc.cpp" diff --git a/src/frontends/qt4/QIndex.h b/src/frontends/qt4/GuiIndex.h similarity index 70% rename from src/frontends/qt4/QIndex.h rename to src/frontends/qt4/GuiIndex.h index e3828c4051..fdeea347ff 100644 --- a/src/frontends/qt4/QIndex.h +++ b/src/frontends/qt4/GuiIndex.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QIndex.h + * \file GuiIndex.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef QINDEX_H #define QINDEX_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_IndexUi.h" #include @@ -22,12 +22,12 @@ namespace lyx { namespace frontend { -class QIndex; +class GuiIndex; -class QIndexDialog : public QDialog, public Ui::QIndexUi { +class GuiIndexDialog : public QDialog, public Ui::IndexUi { Q_OBJECT public: - QIndexDialog(QIndex * form); + GuiIndexDialog(GuiIndex * form); protected Q_SLOTS: virtual void change_adaptor(); @@ -35,19 +35,19 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QIndex * form_; + GuiIndex * form_; }; class ControlCommand; -class QIndex : - public QController > +class GuiIndex : + public QController > { public: - friend class QIndexDialog; + friend class GuiIndexDialog; - QIndex(Dialog &, docstring const & title, QString const & label); + GuiIndex(Dialog &, docstring const & title, QString const & label); protected: virtual bool isValid(); private: diff --git a/src/frontends/qt4/QKeySymbol.cpp b/src/frontends/qt4/GuiKeySymbol.cpp similarity index 80% rename from src/frontends/qt4/QKeySymbol.cpp rename to src/frontends/qt4/GuiKeySymbol.cpp index 195d009310..79baf39fff 100644 --- a/src/frontends/qt4/QKeySymbol.cpp +++ b/src/frontends/qt4/GuiKeySymbol.cpp @@ -1,29 +1,24 @@ /** - * \file QKeySymbol.cpp + * \file qt4/KeySymbolFactory.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Asger and Jürgen - * \author John Levon + * \author Asger & Jürgen * * Full author contact details are available in file CREDITS. */ #include -#include "QKeySymbol.h" +#include "frontends/KeySymbol.h" + +#include "GuiKeySymbol.h" + #include "qlkey.h" #include "qt_helpers.h" - #include "debug.h" -#include -#include -#include -#include - -#include #include "support/lstrings.h" #include "support/environment.h" #include "support/unicode.h" @@ -31,6 +26,13 @@ #include "Encoding.h" #include "Language.h" +#include +#include +#include +#include + +#include + namespace lyx { @@ -41,13 +43,17 @@ using lyx::support::contains; using lyx::support::getEnv; -namespace { +KeySymbol * createKeySymbol() +{ + return new GuiKeySymbol; +} -typedef map EncodingMap; -EncodingMap encoding_map; -char const encode(string const & encoding, QString const & str) +static char const encode(string const & encoding, QString const & str) { + typedef map EncodingMap; + EncodingMap encoding_map; + QTextCodec * codec = 0; EncodingMap::const_iterator cit = encoding_map.find(encoding); @@ -75,16 +81,14 @@ char const encode(string const & encoding, QString const & str) return codec->fromUnicode(str).data()[0]; } -} - -QKeySymbol::QKeySymbol() +GuiKeySymbol::GuiKeySymbol() : KeySymbol(), key_(0) { } -void QKeySymbol::set(QKeyEvent * ev) +void GuiKeySymbol::set(QKeyEvent * ev) { key_ = ev->key(); if (ev->text().isNull()) { @@ -97,7 +101,7 @@ void QKeySymbol::set(QKeyEvent * ev) } -void QKeySymbol::init(string const & symbolname) +void GuiKeySymbol::init(string const & symbolname) { key_ = string_to_qkey(symbolname); text_ = toqstr(symbolname); @@ -105,7 +109,7 @@ void QKeySymbol::init(string const & symbolname) } -bool QKeySymbol::isOK() const +bool GuiKeySymbol::isOK() const { bool const ok(!(text_.isEmpty() && key_ == Qt::Key_unknown)); LYXERR(Debug::KEY) << "isOK is " << ok << endl; @@ -113,7 +117,7 @@ bool QKeySymbol::isOK() const } -bool QKeySymbol::isModifier() const +bool GuiKeySymbol::isModifier() const { bool const mod(q_is_modifier(key_)); LYXERR(Debug::KEY) << "isMod is " << mod << endl; @@ -121,7 +125,7 @@ bool QKeySymbol::isModifier() const } -string QKeySymbol::getSymbolName() const +string GuiKeySymbol::getSymbolName() const { string sym(qkey_to_string(key_)); @@ -133,7 +137,7 @@ string QKeySymbol::getSymbolName() const } -char_type QKeySymbol::getUCSEncoded() const +char_type GuiKeySymbol::getUCSEncoded() const { if (text_.isEmpty()) return 0; @@ -143,7 +147,7 @@ char_type QKeySymbol::getUCSEncoded() const if (lyxerr.debugging() && text_.size() > 1) { // We don't know yet how well support the full ucs4 range. - LYXERR(Debug::KEY) << "QKeySymbol::getUCSEncoded()" << endl; + LYXERR(Debug::KEY) << "GuiKeySymbol::getUCSEncoded()" << endl; for (int i = 0; i < text_.size(); ++i) { LYXERR(Debug::KEY) << "char " << i << ": " << text_[i].unicode() << endl; @@ -156,7 +160,7 @@ char_type QKeySymbol::getUCSEncoded() const } -docstring const QKeySymbol::print(key_modifier::state mod, bool forgui) const +docstring const GuiKeySymbol::print(key_modifier::state mod, bool forgui) const { int tmpkey = key_; @@ -174,7 +178,7 @@ docstring const QKeySymbol::print(key_modifier::state mod, bool forgui) const } -bool QKeySymbol::isText() const +bool GuiKeySymbol::isText() const { if (text_.isEmpty()) { LYXERR(Debug::KEY) << "text_ empty, isText() == false" << endl; @@ -185,9 +189,9 @@ bool QKeySymbol::isText() const } -bool QKeySymbol::operator==(KeySymbol const & ks) const +bool GuiKeySymbol::operator==(KeySymbol const & ks) const { - QKeySymbol const & qks = static_cast(ks); + GuiKeySymbol const & qks = static_cast(ks); // we do not have enough info for a fair comparison, so return // false. This works out OK because unknown text from Qt will diff --git a/src/frontends/qt4/QKeySymbol.h b/src/frontends/qt4/GuiKeySymbol.h similarity index 92% rename from src/frontends/qt4/QKeySymbol.h rename to src/frontends/qt4/GuiKeySymbol.h index 3de33cfb8f..a88314cf91 100644 --- a/src/frontends/qt4/QKeySymbol.h +++ b/src/frontends/qt4/GuiKeySymbol.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QKeySymbol.h + * \file GuiKeySymbol.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -28,11 +28,11 @@ namespace lyx { * * This is some really sick stuff. */ -class QKeySymbol : public KeySymbol { +class GuiKeySymbol : public KeySymbol { public: - QKeySymbol(); + GuiKeySymbol(); - virtual ~QKeySymbol() {} + virtual ~GuiKeySymbol() {} /// . /// inlined out because of profiling results under linux when @@ -71,9 +71,8 @@ public: virtual docstring const print(key_modifier::state mod, bool forgui) const; /// - int key() const { - return key_; - } + int key() const { return key_; } + private: /// the Qt sym value int key_; diff --git a/src/frontends/qt4/QListings.cpp b/src/frontends/qt4/GuiListings.cpp similarity index 95% rename from src/frontends/qt4/QListings.cpp rename to src/frontends/qt4/GuiListings.cpp index 373eba9e37..2b4d2b049d 100644 --- a/src/frontends/qt4/QListings.cpp +++ b/src/frontends/qt4/GuiListings.cpp @@ -1,5 +1,5 @@ /** - * \file QListings.cpp + * \file GuiListings.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QListings.h" +#include "GuiListings.h" #include "Qt2BC.h" #include "qt_helpers.h" #include "controllers/ControlListings.h" @@ -42,7 +42,7 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QListingsDialog +// GuiListingsDialog // ///////////////////////////////////////////////////////////////////// @@ -163,7 +163,7 @@ char const * font_styles_gui[] = -QListingsDialog::QListingsDialog(QListings * form) +GuiListingsDialog::GuiListingsDialog(GuiListings * form) : form_(form) { setupUi(this); @@ -214,20 +214,20 @@ QListingsDialog::QListingsDialog(QListings * form) } -void QListingsDialog::closeEvent(QCloseEvent * e) +void GuiListingsDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QListingsDialog::change_adaptor() +void GuiListingsDialog::change_adaptor() { form_->changed(); } -string QListingsDialog::construct_params() +string GuiListingsDialog::construct_params() { string language = languages[languageCO->currentIndex()]; string dialect; @@ -319,7 +319,7 @@ string QListingsDialog::construct_params() } -docstring QListingsDialog::validate_listings_params() +docstring GuiListingsDialog::validate_listings_params() { // use a cache here to avoid repeated validation // of the same parameters @@ -338,7 +338,7 @@ docstring QListingsDialog::validate_listings_params() } -void QListingsDialog::set_listings_msg() +void GuiListingsDialog::set_listings_msg() { static bool isOK = true; docstring msg = validate_listings_params(); @@ -355,7 +355,7 @@ void QListingsDialog::set_listings_msg() } -void QListingsDialog::on_floatCB_stateChanged(int state) +void GuiListingsDialog::on_floatCB_stateChanged(int state) { if (state == Qt::Checked) { inlineCB->setChecked(false); @@ -365,7 +365,7 @@ void QListingsDialog::on_floatCB_stateChanged(int state) } -void QListingsDialog::on_inlineCB_stateChanged(int state) +void GuiListingsDialog::on_inlineCB_stateChanged(int state) { if (state == Qt::Checked) { floatCB->setChecked(false); @@ -374,14 +374,14 @@ void QListingsDialog::on_inlineCB_stateChanged(int state) } -void QListingsDialog::on_numberSideCO_currentIndexChanged(int index) +void GuiListingsDialog::on_numberSideCO_currentIndexChanged(int index) { numberStepLE->setEnabled(index > 0); numberFontSizeCO->setEnabled(index > 0); } -void QListingsDialog::on_languageCO_currentIndexChanged(int index) +void GuiListingsDialog::on_languageCO_currentIndexChanged(int index) { dialectCO->clear(); // 0 is "no dialect" @@ -404,21 +404,21 @@ void QListingsDialog::on_languageCO_currentIndexChanged(int index) ///////////////////////////////////////////////////////////////////// // -// QListings +// GuiListings // ///////////////////////////////////////////////////////////////////// -typedef QController > listings_wrap_base_class; +typedef QController > listings_wrap_base_class; -QListings::QListings(Dialog & parent) +GuiListings::GuiListings(Dialog & parent) : listings_wrap_base_class(parent, _("Program Listing Settings")) { } -void QListings::build_dialog() +void GuiListings::build_dialog() { - dialog_.reset(new QListingsDialog(this)); + dialog_.reset(new GuiListingsDialog(this)); bcview().setOK(dialog_->okPB); bcview().setApply(dialog_->applyPB); @@ -430,7 +430,7 @@ void QListings::build_dialog() } -void QListings::apply() +void GuiListings::apply() { InsetListingsParams & params = controller().params(); params.setInline(dialog_->inlineCB->isChecked()); @@ -452,7 +452,7 @@ string plainParam(std::string const & par) } //namespace anon -void QListings::update_contents() +void GuiListings::update_contents() { // set default values dialog_->listingsTB->setPlainText( @@ -613,7 +613,7 @@ void QListings::update_contents() } -bool QListings::isValid() +bool GuiListings::isValid() { return dialog_->validate_listings_params().empty(); } @@ -623,4 +623,4 @@ bool QListings::isValid() } // namespace lyx -#include "QListings_moc.cpp" +#include "GuiListings_moc.cpp" diff --git a/src/frontends/qt4/QListings.h b/src/frontends/qt4/GuiListings.h similarity index 83% rename from src/frontends/qt4/QListings.h rename to src/frontends/qt4/GuiListings.h index 9e4a45563e..71202e504a 100644 --- a/src/frontends/qt4/QListings.h +++ b/src/frontends/qt4/GuiListings.h @@ -12,7 +12,7 @@ #ifndef QLISTINGS_H #define QLISTINGS_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_ListingsUi.h" #include @@ -21,12 +21,12 @@ namespace lyx { namespace frontend { -class QListings; +class GuiListings; -class QListingsDialog : public QDialog, public Ui::QListingsUi { +class GuiListingsDialog : public QDialog, public Ui::ListingsUi { Q_OBJECT public: - QListingsDialog(QListings * form); + GuiListingsDialog(GuiListings * form); /// get values from all the widgets and form a string std::string construct_params(); /// validate listings parameters and return an error message, if any @@ -49,17 +49,17 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QListings * form_; + GuiListings * form_; }; class ControlListings; -class QListings : public QController > { +class GuiListings : public QController > { public: - friend class QListingsDialog; + friend class GuiListingsDialog; - QListings(Dialog &); + GuiListings(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QLog.cpp b/src/frontends/qt4/GuiLog.cpp similarity index 87% rename from src/frontends/qt4/QLog.cpp rename to src/frontends/qt4/GuiLog.cpp index 64f9030d9a..370ab8532f 100644 --- a/src/frontends/qt4/QLog.cpp +++ b/src/frontends/qt4/GuiLog.cpp @@ -1,5 +1,5 @@ /** - * \file QLog.cpp + * \file GuiLog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QLog.h" +#include "GuiLog.h" #include "qt_helpers.h" #include "frontends/Application.h" @@ -27,12 +27,12 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QLogDialog +// GuiLogDialog // ///////////////////////////////////////////////////////////////////// -QLogDialog::QLogDialog(QLog * form) +GuiLogDialog::GuiLogDialog(GuiLog * form) : form_(form) { setupUi(this); @@ -44,14 +44,14 @@ QLogDialog::QLogDialog(QLog * form) } -void QLogDialog::closeEvent(QCloseEvent * e) +void GuiLogDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QLogDialog::updateClicked() +void GuiLogDialog::updateClicked() { form_->update_contents(); } @@ -103,20 +103,20 @@ void LogHighlighter::highlightBlock(QString const & text) ///////////////////////////////////////////////////////////////////// // -// QLog +// GuiLog // ///////////////////////////////////////////////////////////////////// -typedef QController > LogBase; +typedef QController > LogBase; -QLog::QLog(Dialog & parent) +GuiLog::GuiLog(Dialog & parent) : LogBase(parent, docstring()) {} -void QLog::build_dialog() +void GuiLog::build_dialog() { - dialog_.reset(new QLogDialog(this)); + dialog_.reset(new GuiLogDialog(this)); // set syntax highlighting highlighter = new LogHighlighter(dialog_->logTB->document()); // @@ -129,7 +129,7 @@ void QLog::build_dialog() } -void QLog::update_contents() +void GuiLog::update_contents() { setTitle(controller().title()); @@ -142,4 +142,4 @@ void QLog::update_contents() } // namespace frontend } // namespace lyx -#include "QLog_moc.cpp" +#include "GuiLog_moc.cpp" diff --git a/src/frontends/qt4/QLog.h b/src/frontends/qt4/GuiLog.h similarity index 77% rename from src/frontends/qt4/QLog.h rename to src/frontends/qt4/GuiLog.h index 28b1ebb7d3..3d834017bc 100644 --- a/src/frontends/qt4/QLog.h +++ b/src/frontends/qt4/GuiLog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QLog.h + * \file GuiLog.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -9,10 +9,10 @@ * Full author contact details are available in file CREDITS. */ -#ifndef QLOG_H -#define QLOG_H +#ifndef GUILOG_H +#define GUILOG_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_LogUi.h" @@ -24,18 +24,18 @@ namespace lyx { namespace frontend { -class QLog; +class GuiLog; -class QLogDialog : public QDialog, public Ui::QLogUi { +class GuiLogDialog : public QDialog, public Ui::LogUi { Q_OBJECT public: - QLogDialog(QLog * form); + GuiLogDialog(GuiLog * form); protected Q_SLOTS: virtual void updateClicked(); protected: virtual void closeEvent(QCloseEvent * e); private: - QLog * form_; + GuiLog * form_; }; @@ -43,14 +43,14 @@ class ControlLog; class LogHighlighter; /// -class QLog - : public QController > +class GuiLog + : public QController > { public: /// - friend class QLogDialog; + friend class GuiLogDialog; /// - QLog(Dialog &); + GuiLog(Dialog &); private: /// Apply changes virtual void apply() {} diff --git a/src/frontends/qt4/QMathMatrixDialog.cpp b/src/frontends/qt4/GuiMathMatrixDialog.cpp similarity index 79% rename from src/frontends/qt4/QMathMatrixDialog.cpp rename to src/frontends/qt4/GuiMathMatrixDialog.cpp index 2f26ef00f7..8978fd112b 100644 --- a/src/frontends/qt4/QMathMatrixDialog.cpp +++ b/src/frontends/qt4/GuiMathMatrixDialog.cpp @@ -1,5 +1,5 @@ /** - * \file QMathMatrixDialog.cpp + * \file GuiMathMatrixDialog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QMathMatrixDialog.h" +#include "GuiMathMatrixDialog.h" #include "EmptyTable.h" #include "qt_helpers.h" @@ -39,21 +39,21 @@ char v_align_c[] = "tcb"; } // namespace anon -typedef QController > matrix_base; +typedef QController > matrix_base; -QMathMatrix::QMathMatrix(Dialog & parent) +GuiMathMatrix::GuiMathMatrix(Dialog & parent) : matrix_base(parent, _("Math Matrix")) {} -void QMathMatrix::build_dialog() +void GuiMathMatrix::build_dialog() { - dialog_.reset(new QMathMatrixDialog(this)); + dialog_.reset(new GuiMathMatrixDialog(this)); } -QMathMatrixDialog::QMathMatrixDialog(QMathMatrix * form) +GuiMathMatrixDialog::GuiMathMatrixDialog(GuiMathMatrix * form) : form_(form) { setupUi(this); @@ -87,7 +87,7 @@ QMathMatrixDialog::QMathMatrixDialog(QMathMatrix * form) } -void QMathMatrixDialog::columnsChanged(int) +void GuiMathMatrixDialog::columnsChanged(int) { int const nx = int(columnsSB->value()); for (int i = 0; i < nx; ++i) @@ -98,18 +98,18 @@ void QMathMatrixDialog::columnsChanged(int) } -void QMathMatrixDialog::rowsChanged(int) +void GuiMathMatrixDialog::rowsChanged(int) { } -void QMathMatrixDialog::change_adaptor() +void GuiMathMatrixDialog::change_adaptor() { // FIXME: We need a filter for the halign input } -void QMathMatrixDialog::slotOK() +void GuiMathMatrixDialog::slotOK() { char const c = v_align_c[valignCO->currentIndex()]; string const sh = fromqstr(halignED->text()); @@ -125,7 +125,7 @@ void QMathMatrixDialog::slotOK() } -void QMathMatrixDialog::slotClose() +void GuiMathMatrixDialog::slotClose() { close(); } @@ -133,4 +133,4 @@ void QMathMatrixDialog::slotClose() } // namespace frontend } // namespace lyx -#include "QMathMatrixDialog_moc.cpp" +#include "GuiMathMatrixDialog_moc.cpp" diff --git a/src/frontends/qt4/QMathMatrixDialog.h b/src/frontends/qt4/GuiMathMatrixDialog.h similarity index 70% rename from src/frontends/qt4/QMathMatrixDialog.h rename to src/frontends/qt4/GuiMathMatrixDialog.h index 7d7ce07dae..ef3b3814ef 100644 --- a/src/frontends/qt4/QMathMatrixDialog.h +++ b/src/frontends/qt4/GuiMathMatrixDialog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QMathMatrixDialog.h + * \file GuiMathMatrixDialog.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #ifndef QMATHMATRIXDIALOG_H #define QMATHMATRIXDIALOG_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_MathMatrixUi.h" @@ -23,14 +23,14 @@ namespace lyx { namespace frontend { -class QMathMatrix; +class GuiMathMatrix; class ControlMath; -class QMathMatrixDialog : public QDialog, public Ui::QMathMatrixUi { +class GuiMathMatrixDialog : public QDialog, public Ui::MathMatrixUi { Q_OBJECT public: - QMathMatrixDialog(QMathMatrix * form); + GuiMathMatrixDialog(GuiMathMatrix * form); public Q_SLOTS: void slotOK(); void slotClose(); @@ -39,15 +39,15 @@ protected Q_SLOTS: virtual void rowsChanged(int); virtual void change_adaptor(); private: - QMathMatrix * form_; + GuiMathMatrix * form_; }; -class QMathMatrix : public QController > { +class GuiMathMatrix : public QController > { public: - friend class QMathMatrixDialog; + friend class GuiMathMatrixDialog; - QMathMatrix(Dialog &); + GuiMathMatrix(Dialog &); private: virtual void apply() {} diff --git a/src/frontends/qt4/QLMenubar.cpp b/src/frontends/qt4/GuiMenubar.cpp similarity index 92% rename from src/frontends/qt4/QLMenubar.cpp rename to src/frontends/qt4/GuiMenubar.cpp index aba834f26d..13254c2046 100644 --- a/src/frontends/qt4/QLMenubar.cpp +++ b/src/frontends/qt4/GuiMenubar.cpp @@ -1,5 +1,5 @@ /** - * \file qt4/QLMenubar.cpp + * \file qt4/GuiMenubar.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -15,8 +15,8 @@ #include "GuiView.h" #include "Action.h" -#include "QLMenubar.h" -#include "QLPopupMenu.h" +#include "GuiMenubar.h" +#include "GuiPopupMenu.h" #include "qt_helpers.h" #include "support/lstrings.h" @@ -37,8 +37,8 @@ namespace frontend { // MacOSX specific stuff is at the end. -QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe) - : owner_(static_cast(view)), menubackend_(mbe) +GuiMenubar::GuiMenubar(LyXView * view, MenuBackend & mbe) + : owner_(static_cast(view)), menubackend_(mbe) { macxMenuBarInit(); @@ -82,7 +82,7 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe) Menu menu; menubackend_.expand(menubackend_.getMenubar(), menu, owner_->buffer()); - QLPopupMenu * qMenu = new QLPopupMenu(this, *m, true); + GuiPopupMenu * qMenu = new GuiPopupMenu(this, *m, true); owner_->menuBar()->addMenu(qMenu); pair I = name_map_.insert(make_pair(name, qMenu)); @@ -99,7 +99,7 @@ QLMenubar::QLMenubar(LyXView * view, MenuBackend & mbe) //QObject::connect(owner_->menuBar(), SIGNAL(triggered()), this, SLOT(update())); } -void QLMenubar::openByName(docstring const & name) +void GuiMenubar::openByName(docstring const & name) { NameMap::const_iterator const cit = name_map_.find(name); if (cit == name_map_.end()) @@ -111,18 +111,6 @@ void QLMenubar::openByName(docstring const & name) } -GuiView * QLMenubar::view() -{ - return owner_; -} - - -MenuBackend const & QLMenubar::backend() -{ - return menubackend_; -} - - /// Some special Qt/Mac support hacks /* @@ -146,7 +134,7 @@ MenuBackend const & QLMenubar::backend() that this menubar will be used also when one of LyX' dialogs has focus. (JMarc) */ -QMenuBar * QLMenubar::menuBar() const +QMenuBar * GuiMenubar::menuBar() const { #ifdef Q_WS_MACX return mac_menubar_.get(); @@ -159,7 +147,7 @@ QMenuBar * QLMenubar::menuBar() const extern void qt_mac_set_menubar_merge(bool b); #endif -void QLMenubar::macxMenuBarInit() +void GuiMenubar::macxMenuBarInit() { #ifdef Q_WS_MACX mac_menubar_.reset(new QMenuBar); @@ -233,4 +221,4 @@ void QLMenubar::macxMenuBarInit() } // namespace frontend } // namespace lyx -#include "QLMenubar_moc.cpp" +#include "GuiMenubar_moc.cpp" diff --git a/src/frontends/qt4/QLMenubar.h b/src/frontends/qt4/GuiMenubar.h similarity index 77% rename from src/frontends/qt4/QLMenubar.h rename to src/frontends/qt4/GuiMenubar.h index 0f044142ef..a28ada3d2e 100644 --- a/src/frontends/qt4/QLMenubar.h +++ b/src/frontends/qt4/GuiMenubar.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file qt4/QLMenubar.h + * \file qt4/GuiMenubar.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef QLMENUBAR_H #define QLMENUBAR_H -#include "QLPopupMenu.h" +#include "GuiPopupMenu.h" #include #include @@ -29,22 +29,22 @@ class MenuItem; namespace frontend { -class GuiView; +class GuiViewBase; class LyXView; -class QLMenubar : public QObject { +class GuiMenubar : public QObject { Q_OBJECT public: - QLMenubar(LyXView *, MenuBackend &); + GuiMenubar(LyXView *, MenuBackend &); /// opens a top-level submenu given its name void openByName(docstring const &); /// return the owning view - GuiView * view(); + GuiViewBase * view() { return owner_; } /// return the menu controller - MenuBackend const & backend(); + MenuBackend const & backend() { return menubackend_; } /// The QMenuBar used by LyX QMenuBar * menuBar() const; @@ -57,12 +57,12 @@ private: void macxMenuBarInit(); /// owning view - GuiView * owner_; + GuiViewBase * owner_; /// menu controller MenuBackend & menubackend_; - typedef std::map NameMap; + typedef std::map NameMap; /// name to menu for openByName NameMap name_map_; diff --git a/src/frontends/qt4/QNomencl.cpp b/src/frontends/qt4/GuiNomencl.cpp similarity index 79% rename from src/frontends/qt4/QNomencl.cpp rename to src/frontends/qt4/GuiNomencl.cpp index d4e5c8fb0e..01606ceb3c 100644 --- a/src/frontends/qt4/QNomencl.cpp +++ b/src/frontends/qt4/GuiNomencl.cpp @@ -1,5 +1,5 @@ /** - * \file QNomencl.cpp + * \file GuiNomencl.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -15,7 +15,7 @@ #include "ControlCommand.h" #include "qt_helpers.h" -#include "QNomencl.h" +#include "GuiNomencl.h" #include "Qt2BC.h" #include "ButtonController.h" #include @@ -32,11 +32,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QNomenclDialog +// GuiNomenclDialog // ///////////////////////////////////////////////////////////////////// -QNomenclDialog::QNomenclDialog(QNomencl * form) +GuiNomenclDialog::GuiNomenclDialog(GuiNomencl * form) : form_(form) { setupUi(this); @@ -52,25 +52,25 @@ QNomenclDialog::QNomenclDialog(QNomencl * form) } -void QNomenclDialog::show() +void GuiNomenclDialog::show() { QDialog::show(); } -void QNomenclDialog::change_adaptor() +void GuiNomenclDialog::change_adaptor() { form_->changed(); } -void QNomenclDialog::reject() +void GuiNomenclDialog::reject() { form_->slotClose(); } -void QNomenclDialog::closeEvent(QCloseEvent * e) +void GuiNomenclDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); @@ -79,23 +79,23 @@ void QNomenclDialog::closeEvent(QCloseEvent * e) ///////////////////////////////////////////////////////////////////// // -// QNomencl +// GuiNomencl // ///////////////////////////////////////////////////////////////////// -typedef QController > NomenBase; +typedef QController > NomenBase; -QNomencl::QNomencl(Dialog & parent, docstring const & title) +GuiNomencl::GuiNomencl(Dialog & parent, docstring const & title) : NomenBase(parent, title) { } -void QNomencl::build_dialog() +void GuiNomencl::build_dialog() { - dialog_.reset(new QNomenclDialog(this)); + dialog_.reset(new GuiNomenclDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); @@ -105,7 +105,7 @@ void QNomencl::build_dialog() } -void QNomencl::update_contents() +void GuiNomencl::update_contents() { dialog_->prefixED->setText(toqstr(controller().params()["prefix"])); dialog_->symbolED->setText(toqstr(controller().params()["symbol"])); @@ -117,7 +117,7 @@ void QNomencl::update_contents() } -void QNomencl::apply() +void GuiNomencl::apply() { controller().params()["prefix"] = qstring_to_ucs4(dialog_->prefixED->text()); controller().params()["symbol"] = qstring_to_ucs4(dialog_->symbolED->text()); @@ -127,7 +127,7 @@ void QNomencl::apply() } -bool QNomencl::isValid() +bool GuiNomencl::isValid() { QString const description = dialog_->descriptionTE->toPlainText(); return !dialog_->symbolED->text().isEmpty() && !description.isEmpty(); @@ -136,4 +136,4 @@ bool QNomencl::isValid() } // namespace frontend } // namespace lyx -#include "QNomencl_moc.cpp" +#include "GuiNomencl_moc.cpp" diff --git a/src/frontends/qt4/QNomencl.h b/src/frontends/qt4/GuiNomencl.h similarity index 71% rename from src/frontends/qt4/QNomencl.h rename to src/frontends/qt4/GuiNomencl.h index 4246a9fc72..9fcad8bd7b 100644 --- a/src/frontends/qt4/QNomencl.h +++ b/src/frontends/qt4/GuiNomencl.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QNomencl.h + * \file GuiNomencl.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #ifndef QNOMENCL_H #define QNOMENCL_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_NomenclUi.h" #include @@ -25,12 +25,12 @@ class QCloseEvent; namespace lyx { namespace frontend { -class QNomencl; +class GuiNomencl; -class QNomenclDialog : public QDialog, public Ui::QNomenclUi { +class GuiNomenclDialog : public QDialog, public Ui::NomenclUi { Q_OBJECT public: - QNomenclDialog(QNomencl * form); + GuiNomenclDialog(GuiNomencl * form); virtual void show(); protected Q_SLOTS: virtual void change_adaptor(); @@ -38,19 +38,19 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QNomencl * form_; + GuiNomencl * form_; }; class ControlCommand; -class QNomencl : - public QController > +class GuiNomencl : + public QController > { public: - friend class QNomenclDialog; + friend class GuiNomenclDialog; - QNomencl(Dialog &, docstring const & title); + GuiNomencl(Dialog &, docstring const & title); protected: virtual bool isValid(); private: diff --git a/src/frontends/qt4/QNote.cpp b/src/frontends/qt4/GuiNote.cpp similarity index 83% rename from src/frontends/qt4/QNote.cpp rename to src/frontends/qt4/GuiNote.cpp index 1751e610d8..03e7c714c8 100644 --- a/src/frontends/qt4/QNote.cpp +++ b/src/frontends/qt4/GuiNote.cpp @@ -1,5 +1,5 @@ /** - * \file QNote.cpp + * \file GuiNote.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QNote.h" +#include "GuiNote.h" #include "Qt2BC.h" #include "controllers/ControlNote.h" @@ -24,11 +24,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QNoteDialog +// GuiNoteDialog // ///////////////////////////////////////////////////////////////////// -QNoteDialog::QNoteDialog(QNote * form) +GuiNoteDialog::GuiNoteDialog(GuiNote * form) : form_(form) { setupUi(this); @@ -44,14 +44,14 @@ QNoteDialog::QNoteDialog(QNote * form) } -void QNoteDialog::closeEvent(QCloseEvent * e) +void GuiNoteDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QNoteDialog::change_adaptor() +void GuiNoteDialog::change_adaptor() { form_->changed(); } @@ -59,28 +59,28 @@ void QNoteDialog::change_adaptor() ///////////////////////////////////////////////////////////////////// // -// QNote +// GuiNote // ///////////////////////////////////////////////////////////////////// -typedef QController > NoteBase; +typedef QController > NoteBase; -QNote::QNote(Dialog & parent) +GuiNote::GuiNote(Dialog & parent) : NoteBase(parent, _("Note Settings")) {} -void QNote::build_dialog() +void GuiNote::build_dialog() { - dialog_.reset(new QNoteDialog(this)); + dialog_.reset(new GuiNoteDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); } -void QNote::update_contents() +void GuiNote::update_contents() { QRadioButton * rb = 0; @@ -106,7 +106,7 @@ void QNote::update_contents() } -void QNote::apply() +void GuiNote::apply() { InsetNoteParams::Type type; @@ -127,4 +127,4 @@ void QNote::apply() } // namespace frontend } // namespace lyx -#include "QNote_moc.cpp" +#include "GuiNote_moc.cpp" diff --git a/src/frontends/qt4/QNote.h b/src/frontends/qt4/GuiNote.h similarity index 74% rename from src/frontends/qt4/QNote.h rename to src/frontends/qt4/GuiNote.h index f39c9e9276..6032daff2a 100644 --- a/src/frontends/qt4/QNote.h +++ b/src/frontends/qt4/GuiNote.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QNote.h + * \file GuiNote.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QNOTE_H #define QNOTE_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_NoteUi.h" #include @@ -21,18 +21,18 @@ class QCloseEvent; namespace lyx { namespace frontend { -class QNote; +class GuiNote; -class QNoteDialog : public QDialog, public Ui::QNoteUi { +class GuiNoteDialog : public QDialog, public Ui::NoteUi { Q_OBJECT public: - QNoteDialog(QNote * form); + GuiNoteDialog(GuiNote * form); protected Q_SLOTS: virtual void change_adaptor(); protected: virtual void closeEvent(QCloseEvent * e); private: - QNote * form_; + GuiNote * form_; }; @@ -40,13 +40,13 @@ class ControlNote; /** This class provides a QT implementation of the Note Dialog. */ -class QNote : public QController > +class GuiNote : public QController > { public: - friend class QNoteDialog; + friend class GuiNoteDialog; /// Constructor - QNote(Dialog &); + GuiNote(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QLPainter.cpp b/src/frontends/qt4/GuiPainter.cpp similarity index 99% rename from src/frontends/qt4/QLPainter.cpp rename to src/frontends/qt4/GuiPainter.cpp index d290f48b21..a3bc70cf71 100644 --- a/src/frontends/qt4/QLPainter.cpp +++ b/src/frontends/qt4/GuiPainter.cpp @@ -1,5 +1,5 @@ /** - * \file QLPainter.cpp + * \file GuiPainter.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,11 +11,11 @@ #include -#include "QLPainter.h" +#include "GuiPainter.h" #include "GuiApplication.h" #include "GuiFontMetrics.h" -#include "QLImage.h" +#include "GuiImage.h" #include "GuiApplication.h" #include "qt_helpers.h" diff --git a/src/frontends/qt4/QLPainter.h b/src/frontends/qt4/GuiPainter.h similarity index 99% rename from src/frontends/qt4/QLPainter.h rename to src/frontends/qt4/GuiPainter.h index a8c4353612..39c50a2724 100644 --- a/src/frontends/qt4/QLPainter.h +++ b/src/frontends/qt4/GuiPainter.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QLPainter.h + * \file GuiPainter.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/QParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp similarity index 89% rename from src/frontends/qt4/QParagraph.cpp rename to src/frontends/qt4/GuiParagraph.cpp index d31c4df451..e7f750981e 100644 --- a/src/frontends/qt4/QParagraph.cpp +++ b/src/frontends/qt4/GuiParagraph.cpp @@ -1,5 +1,5 @@ /** - * \file QParagraph.cpp + * \file GuiParagraph.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QParagraph.h" +#include "GuiParagraph.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -31,7 +31,7 @@ using std::endl; ///////////////////////////////////////////////////////////////////// // -// QParagraphDialog +// GuiParagraphDialog // ///////////////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ using std::endl; namespace lyx { namespace frontend { -QParagraphDialog::QParagraphDialog(QParagraph * form) +GuiParagraphDialog::GuiParagraphDialog(GuiParagraph * form) : form_(form) { setupUi(this); @@ -91,27 +91,27 @@ QParagraphDialog::QParagraphDialog(QParagraph * form) } -void QParagraphDialog::closeEvent(QCloseEvent * e) +void GuiParagraphDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QParagraphDialog::change_adaptor() +void GuiParagraphDialog::change_adaptor() { form_->changed(); } -void QParagraphDialog::enableLinespacingValue(int) +void GuiParagraphDialog::enableLinespacingValue(int) { bool const enable = linespacing->currentIndex() == 4; linespacingValue->setEnabled(enable); } -void QParagraphDialog::checkAlignmentRadioButtons() { +void GuiParagraphDialog::checkAlignmentRadioButtons() { LyXAlignment const alignPossible = form_->controller().alignPossible(); QPRadioMap::iterator it = radioMap.begin(); @@ -126,7 +126,7 @@ void QParagraphDialog::checkAlignmentRadioButtons() { } -void QParagraphDialog::alignmentToRadioButtons(LyXAlignment align) +void GuiParagraphDialog::alignmentToRadioButtons(LyXAlignment align) { QPRadioMap::const_iterator it = radioMap.begin(); for (;it != radioMap.end(); ++it) { @@ -143,7 +143,7 @@ void QParagraphDialog::alignmentToRadioButtons(LyXAlignment align) } -LyXAlignment QParagraphDialog::getAlignmentFromDialog() +LyXAlignment GuiParagraphDialog::getAlignmentFromDialog() { LyXAlignment alignment = LYX_ALIGN_NONE; QPRadioMap::const_iterator it = radioMap.begin(); @@ -159,23 +159,23 @@ LyXAlignment QParagraphDialog::getAlignmentFromDialog() ///////////////////////////////////////////////////////////////////// // -// QParagraph +// GuiParagraph // ///////////////////////////////////////////////////////////////////// -typedef QController > +typedef QController > ParagraphBase; -QParagraph::QParagraph(Dialog & parent) +GuiParagraph::GuiParagraph(Dialog & parent) : ParagraphBase(parent, _("Paragraph Settings")) {} -void QParagraph::build_dialog() +void GuiParagraph::build_dialog() { // the dialog - dialog_.reset(new QParagraphDialog(this)); + dialog_.reset(new GuiParagraphDialog(this)); // Manage the ok, apply, restore and cancel/close buttons bcview().setOK(dialog_->okPB); @@ -185,7 +185,7 @@ void QParagraph::build_dialog() } -void QParagraph::apply() +void GuiParagraph::apply() { ParagraphParameters & params = controller().params(); @@ -223,7 +223,7 @@ void QParagraph::apply() } -void QParagraph::update_contents() +void GuiParagraph::update_contents() { ParagraphParameters const & params = controller().params(); @@ -280,4 +280,4 @@ void QParagraph::update_contents() } // namespace frontend } // namespace lyx -#include "QParagraph_moc.cpp" +#include "GuiParagraph_moc.cpp" diff --git a/src/frontends/qt4/QParagraph.h b/src/frontends/qt4/GuiParagraph.h similarity index 77% rename from src/frontends/qt4/QParagraph.h rename to src/frontends/qt4/GuiParagraph.h index 624d627f16..133437d4ed 100644 --- a/src/frontends/qt4/QParagraph.h +++ b/src/frontends/qt4/GuiParagraph.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QParagraph.h + * \file GuiParagraph.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef QPARAGRAPH_H #define QPARAGRAPH_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "Layout.h" #include "ui_ParagraphUi.h" @@ -26,12 +26,12 @@ namespace lyx { namespace frontend { -class QParagraph; +class GuiParagraph; -class QParagraphDialog : public QDialog, public Ui::QParagraphUi { +class GuiParagraphDialog : public QDialog, public Ui::ParagraphUi { Q_OBJECT public: - QParagraphDialog(QParagraph * form); + GuiParagraphDialog(GuiParagraph * form); /// void checkAlignmentRadioButtons(); /// @@ -41,7 +41,7 @@ public: protected: void closeEvent (QCloseEvent * e); private: - QParagraph * form_; + GuiParagraph * form_; typedef std::map QPRadioMap; QPRadioMap radioMap; typedef std::map QPAlignmentLabels; @@ -57,13 +57,13 @@ protected Q_SLOTS: class ControlParagraph; -class QParagraph - : public QController > +class GuiParagraph + : public QController > { public: - friend class QParagraphDialog; + friend class GuiParagraphDialog; - QParagraph(Dialog &); + GuiParagraph(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QLPopupMenu.cpp b/src/frontends/qt4/GuiPopupMenu.cpp similarity index 85% rename from src/frontends/qt4/QLPopupMenu.cpp rename to src/frontends/qt4/GuiPopupMenu.cpp index 37d9170248..9b479fc7d4 100644 --- a/src/frontends/qt4/QLPopupMenu.cpp +++ b/src/frontends/qt4/GuiPopupMenu.cpp @@ -1,5 +1,5 @@ /** - * \file QLPopupMenu.cpp + * \file GuiPopupMenu.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -18,8 +18,8 @@ #include "GuiView.h" #include "Action.h" -#include "QLPopupMenu.h" -#include "QLMenubar.h" +#include "GuiPopupMenu.h" +#include "GuiMenubar.h" #include "qt_helpers.h" #include "MenuBackend.h" @@ -36,7 +36,7 @@ using std::endl; namespace lyx { namespace frontend { -QLPopupMenu::QLPopupMenu(QLMenubar * owner, +GuiPopupMenu::GuiPopupMenu(GuiMenubar * owner, MenuItem const & mi, bool topLevelMenu) : owner_(owner) { @@ -49,7 +49,7 @@ QLPopupMenu::QLPopupMenu(QLMenubar * owner, } -void QLPopupMenu::update() +void GuiPopupMenu::update() { LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION << endl; LYXERR(Debug::GUI) << "\tTriggered menu: " << to_utf8(name_) << endl; @@ -72,7 +72,8 @@ void QLPopupMenu::update() populate(this, &topLevelMenu_); } -void QLPopupMenu::populate(QMenu* qMenu, Menu * menu) + +void GuiPopupMenu::populate(QMenu * qMenu, Menu * menu) { LYXERR(Debug::GUI) << "populating menu " << to_utf8(menu->name()) ; if (menu->size() == 0) { @@ -117,7 +118,7 @@ void QLPopupMenu::populate(QMenu* qMenu, Menu * menu) } -docstring const QLPopupMenu::getLabel(MenuItem const & mi) +docstring const GuiPopupMenu::getLabel(MenuItem const & mi) { docstring const shortcut = mi.shortcut(); docstring label = support::subst(mi.label(), @@ -132,19 +133,20 @@ docstring const QLPopupMenu::getLabel(MenuItem const & mi) return label; } -void QLPopupMenu::addBinding(docstring & label, MenuItem const & mi) + +void GuiPopupMenu::addBinding(docstring & label, MenuItem const & mi) { #ifdef Q_WS_MACX - docstring const binding(mi.binding(false)); + docstring const binding = mi.binding(false); #else - docstring const binding(mi.binding(true)); + docstring const binding = mi.binding(true); #endif - if (!binding.empty()) { + if (!binding.empty()) label += '\t' + binding; - } } + } // namespace frontend } // namespace lyx -#include "QLPopupMenu_moc.cpp" +#include "GuiPopupMenu_moc.cpp" diff --git a/src/frontends/qt4/QLPopupMenu.h b/src/frontends/qt4/GuiPopupMenu.h similarity index 85% rename from src/frontends/qt4/QLPopupMenu.h rename to src/frontends/qt4/GuiPopupMenu.h index 140adc0961..903e3c4628 100644 --- a/src/frontends/qt4/QLPopupMenu.h +++ b/src/frontends/qt4/GuiPopupMenu.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QLPopupMenu.h + * \file GuiPopupMenu.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -20,14 +20,14 @@ namespace lyx { namespace frontend { -class QLMenubar; +class GuiMenubar; /// a submenu -class QLPopupMenu : public QMenu { +class GuiPopupMenu : public QMenu { Q_OBJECT public: - QLPopupMenu(QLMenubar * owner, MenuItem const & mi, bool topLevelMenu=false); + GuiPopupMenu(GuiMenubar * owner, MenuItem const & mi, bool topLevelMenu=false); /// populates the menu or one of its submenu /// This is used as a recursive function @@ -40,7 +40,7 @@ public Q_SLOTS: private: /// our owning menubar - QLMenubar * owner_; + GuiMenubar * owner_; /// the name of this menu docstring name_; diff --git a/src/frontends/qt4/QPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp similarity index 97% rename from src/frontends/qt4/QPrefs.cpp rename to src/frontends/qt4/GuiPrefs.cpp index d1f5415748..54f4ba400c 100644 --- a/src/frontends/qt4/QPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -1,5 +1,5 @@ /** - * \file QPrefs.cpp + * \file GuiPrefs.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QPrefs.h" +#include "GuiPrefs.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -22,7 +22,7 @@ #include "Color.h" #include "Font.h" #include "PanelStack.h" -#include "QFontExample.h" +#include "GuiFontExample.h" #include "gettext.h" #include "support/lstrings.h" @@ -223,7 +223,7 @@ void PrefDate::update(LyXRC const & rc) // ///////////////////////////////////////////////////////////////////// -PrefKeyboard::PrefKeyboard(QPrefs * form, QWidget * parent) +PrefKeyboard::PrefKeyboard(GuiPrefs * form, QWidget * parent) : PrefModule(_("Keyboard"), form, parent) { setupUi(this); @@ -294,7 +294,7 @@ void PrefKeyboard::on_keymapCB_toggled(bool keymap) // ///////////////////////////////////////////////////////////////////// -PrefLatex::PrefLatex(QPrefs * form, QWidget * parent) +PrefLatex::PrefLatex(GuiPrefs * form, QWidget * parent) : PrefModule(_("LaTeX"), form, parent) { setupUi(this); @@ -347,7 +347,7 @@ void PrefLatex::update(LyXRC const & rc) // ///////////////////////////////////////////////////////////////////// -PrefScreenFonts::PrefScreenFonts(QPrefs * form, QWidget * parent) +PrefScreenFonts::PrefScreenFonts(GuiPrefs * form, QWidget * parent) : PrefModule(_("Screen fonts"), form, parent) { setupUi(this); @@ -505,7 +505,7 @@ void PrefScreenFonts::select_typewriter(const QString& name) // ///////////////////////////////////////////////////////////////////// -PrefColors::PrefColors(QPrefs * form, QWidget * parent) +PrefColors::PrefColors(GuiPrefs * form, QWidget * parent) : PrefModule( _("Colors"), form, parent) { setupUi(this); @@ -703,7 +703,7 @@ void PrefDisplay::update(LyXRC const & rc) // ///////////////////////////////////////////////////////////////////// -PrefPaths::PrefPaths(QPrefs * form, QWidget * parent) +PrefPaths::PrefPaths(GuiPrefs * form, QWidget * parent) : PrefModule(_("Paths"), form, parent) { setupUi(this); @@ -807,7 +807,7 @@ void PrefPaths::select_lyxpipe() // ///////////////////////////////////////////////////////////////////// -PrefSpellchecker::PrefSpellchecker(QPrefs * form, QWidget * parent) +PrefSpellchecker::PrefSpellchecker(GuiPrefs * form, QWidget * parent) : PrefModule(_("Spellchecker"), form, parent) { setupUi(this); @@ -917,7 +917,7 @@ void PrefSpellchecker::select_dict() ///////////////////////////////////////////////////////////////////// -PrefConverters::PrefConverters(QPrefs * form, QWidget * parent) +PrefConverters::PrefConverters(GuiPrefs * form, QWidget * parent) : PrefModule(_("Converters"), form, parent) { setupUi(this); @@ -1115,7 +1115,7 @@ void PrefConverters::on_cacheCB_stateChanged(int state) // ///////////////////////////////////////////////////////////////////// -PrefCopiers::PrefCopiers(QPrefs * form, QWidget * parent) +PrefCopiers::PrefCopiers(GuiPrefs * form, QWidget * parent) : PrefModule(_("Copiers"), form, parent) { setupUi(this); @@ -1368,7 +1368,7 @@ void PrefCopiers::remove_copier() // ///////////////////////////////////////////////////////////////////// -PrefFileformats::PrefFileformats(QPrefs * form, QWidget * parent) +PrefFileformats::PrefFileformats(GuiPrefs * form, QWidget * parent) : PrefModule(_("File formats"), form, parent) { setupUi(this); @@ -1760,7 +1760,7 @@ void PrefPrinter::update(LyXRC const & rc) // ///////////////////////////////////////////////////////////////////// -PrefUserInterface::PrefUserInterface(QPrefs * form, QWidget * parent) +PrefUserInterface::PrefUserInterface(GuiPrefs * form, QWidget * parent) : PrefModule(_("User interface"), form, parent) { setupUi(this); @@ -1907,11 +1907,11 @@ void PrefIdentity::update(LyXRC const & rc) ///////////////////////////////////////////////////////////////////// // -// QPrefsDialog +// GuiPrefsDialog // ///////////////////////////////////////////////////////////////////// -QPrefsDialog::QPrefsDialog(QPrefs * form) +GuiPrefsDialog::GuiPrefsDialog(GuiPrefs * form) : form_(form) { setupUi(this); @@ -1969,7 +1969,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form) } -void QPrefsDialog::add(PrefModule * module) +void GuiPrefsDialog::add(PrefModule * module) { BOOST_ASSERT(module); @@ -1980,20 +1980,20 @@ void QPrefsDialog::add(PrefModule * module) modules_.push_back(module); } -void QPrefsDialog::closeEvent(QCloseEvent * e) +void GuiPrefsDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QPrefsDialog::change_adaptor() +void GuiPrefsDialog::change_adaptor() { form_->changed(); } -void QPrefsDialog::apply(LyXRC & rc) const +void GuiPrefsDialog::apply(LyXRC & rc) const { size_t end = modules_.size(); for (size_t i = 0; i != end; ++i) @@ -2001,7 +2001,7 @@ void QPrefsDialog::apply(LyXRC & rc) const } -void QPrefsDialog::updateRc(LyXRC const & rc) +void GuiPrefsDialog::updateRc(LyXRC const & rc) { size_t const end = modules_.size(); for (size_t i = 0; i != end; ++i) @@ -2011,43 +2011,43 @@ void QPrefsDialog::updateRc(LyXRC const & rc) ///////////////////////////////////////////////////////////////////// // -// QPrefs +// GuiPrefs // ///////////////////////////////////////////////////////////////////// -typedef QController > PrefsBase; +typedef QController > PrefsBase; -QPrefs::QPrefs(Dialog & parent) +GuiPrefs::GuiPrefs(Dialog & parent) : PrefsBase(parent, _("Preferences")) { } -Converters & QPrefs::converters() +Converters & GuiPrefs::converters() { return controller().converters(); } -Formats & QPrefs::formats() +Formats & GuiPrefs::formats() { return controller().formats(); } -Movers & QPrefs::movers() +Movers & GuiPrefs::movers() { return controller().movers(); } -void QPrefs::build_dialog() +void GuiPrefs::build_dialog() { - dialog_.reset(new QPrefsDialog(this)); + dialog_.reset(new GuiPrefsDialog(this)); } -void QPrefs::apply() +void GuiPrefs::apply() { dialog_->apply(controller().rc()); } -void QPrefs::update_contents() +void GuiPrefs::update_contents() { dialog_->updateRc(controller().rc()); } @@ -2055,4 +2055,4 @@ void QPrefs::update_contents() } // namespace frontend } // namespace lyx -#include "QPrefs_moc.cpp" +#include "GuiPrefs_moc.cpp" diff --git a/src/frontends/qt4/QPrefs.h b/src/frontends/qt4/GuiPrefs.h similarity index 72% rename from src/frontends/qt4/QPrefs.h rename to src/frontends/qt4/GuiPrefs.h index 86beb937b7..cdb41155c8 100644 --- a/src/frontends/qt4/QPrefs.h +++ b/src/frontends/qt4/GuiPrefs.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QPrefs.h + * \file GuiPrefs.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QPREFS_H #define QPREFS_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "Color.h" #include "LyXRC.h" @@ -50,14 +50,14 @@ class Movers; namespace frontend { -class QPrefs; +class GuiPrefs; class PrefModule : public QWidget { Q_OBJECT public: PrefModule(docstring const & t, - QPrefs * form = 0, QWidget * parent = 0) + GuiPrefs * form = 0, QWidget * parent = 0) : QWidget(parent), title_(t), form_(form) {} @@ -68,14 +68,14 @@ public: protected: docstring title_; - QPrefs * form_; + GuiPrefs * form_; Q_SIGNALS: void changed(); }; -class PrefPlaintext : public PrefModule, public Ui::QPrefPlaintextUi +class PrefPlaintext : public PrefModule, public Ui::PrefPlaintextUi { Q_OBJECT public: @@ -86,7 +86,7 @@ public: }; -class PrefDate : public PrefModule, public Ui::QPrefDateUi +class PrefDate : public PrefModule, public Ui::PrefDateUi { Q_OBJECT public: @@ -97,11 +97,11 @@ public: }; -class PrefKeyboard : public PrefModule, public Ui::QPrefKeyboardUi +class PrefKeyboard : public PrefModule, public Ui::PrefKeyboardUi { Q_OBJECT public: - PrefKeyboard(QPrefs * form, QWidget * parent = 0); + PrefKeyboard(GuiPrefs * form, QWidget * parent = 0); virtual void apply(LyXRC & rc) const; virtual void update(LyXRC const & rc); @@ -116,22 +116,22 @@ private: }; -class PrefLatex : public PrefModule, public Ui::QPrefLatexUi +class PrefLatex : public PrefModule, public Ui::PrefLatexUi { Q_OBJECT public: - PrefLatex(QPrefs * form, QWidget * parent = 0); + PrefLatex(GuiPrefs * form, QWidget * parent = 0); virtual void apply(LyXRC & rc) const; virtual void update(LyXRC const & rc); }; -class PrefScreenFonts : public PrefModule, public Ui::QPrefScreenFontsUi +class PrefScreenFonts : public PrefModule, public Ui::PrefScreenFontsUi { Q_OBJECT public: - PrefScreenFonts(QPrefs * form, QWidget * parent = 0); + PrefScreenFonts(GuiPrefs * form, QWidget * parent = 0); virtual void apply(LyXRC & rc) const; virtual void update(LyXRC const & rc); @@ -143,11 +143,11 @@ private Q_SLOTS: }; -class PrefColors : public PrefModule, public Ui::QPrefColorsUi +class PrefColors : public PrefModule, public Ui::PrefColorsUi { Q_OBJECT public: - PrefColors(QPrefs * form, QWidget * parent = 0); + PrefColors(GuiPrefs * form, QWidget * parent = 0); void apply(LyXRC & rc) const; void update(LyXRC const & rc); @@ -167,7 +167,7 @@ private: }; -class PrefCygwinPath : public PrefModule, public Ui::QPrefCygwinPathUi +class PrefCygwinPath : public PrefModule, public Ui::PrefCygwinPathUi { Q_OBJECT public: @@ -178,7 +178,7 @@ public: }; -class PrefDisplay : public PrefModule, public Ui::QPrefDisplayUi +class PrefDisplay : public PrefModule, public Ui::PrefDisplayUi { Q_OBJECT public: @@ -189,11 +189,11 @@ public: }; -class PrefPaths : public PrefModule, public Ui::QPrefPathsUi +class PrefPaths : public PrefModule, public Ui::PrefPathsUi { Q_OBJECT public: - PrefPaths(QPrefs * form, QWidget * parent = 0); + PrefPaths(GuiPrefs * form, QWidget * parent = 0); void apply(LyXRC & rc) const; void update(LyXRC const & rc); @@ -208,11 +208,11 @@ private Q_SLOTS: }; -class PrefSpellchecker : public PrefModule, public Ui::QPrefSpellcheckerUi +class PrefSpellchecker : public PrefModule, public Ui::PrefSpellcheckerUi { Q_OBJECT public: - PrefSpellchecker(QPrefs * form, QWidget * parent = 0); + PrefSpellchecker(GuiPrefs * form, QWidget * parent = 0); void apply(LyXRC & rc) const; void update(LyXRC const & rc); @@ -222,11 +222,11 @@ private Q_SLOTS: }; -class PrefConverters : public PrefModule, public Ui::QPrefConvertersUi +class PrefConverters : public PrefModule, public Ui::PrefConvertersUi { Q_OBJECT public: - PrefConverters(QPrefs * form, QWidget * parent = 0); + PrefConverters(GuiPrefs * form, QWidget * parent = 0); void apply(LyXRC & rc) const; void update(LyXRC const & rc); @@ -246,11 +246,11 @@ private: }; -class PrefCopiers : public PrefModule, public Ui::QPrefCopiersUi +class PrefCopiers : public PrefModule, public Ui::PrefCopiersUi { Q_OBJECT public: - PrefCopiers(QPrefs * form, QWidget * parent = 0); + PrefCopiers(GuiPrefs * form, QWidget * parent = 0); void apply(LyXRC & rc) const; void update(LyXRC const & rc); @@ -270,11 +270,11 @@ private: }; -class PrefFileformats : public PrefModule, public Ui::QPrefFileformatsUi +class PrefFileformats : public PrefModule, public Ui::PrefFileformatsUi { Q_OBJECT public: - PrefFileformats(QPrefs * form, QWidget * parent = 0); + PrefFileformats(GuiPrefs * form, QWidget * parent = 0); void apply(LyXRC & rc) const; void update(LyXRC const & rc); @@ -294,7 +294,7 @@ private Q_SLOTS: }; -class PrefLanguage : public PrefModule, public Ui::QPrefLanguageUi +class PrefLanguage : public PrefModule, public Ui::PrefLanguageUi { Q_OBJECT public: @@ -308,7 +308,7 @@ private: }; -class PrefPrinter : public PrefModule, public Ui::QPrefPrinterUi +class PrefPrinter : public PrefModule, public Ui::PrefPrinterUi { Q_OBJECT public: @@ -319,11 +319,11 @@ public: }; -class PrefUserInterface : public PrefModule, public Ui::QPrefUi +class PrefUserInterface : public PrefModule, public Ui::PrefUi { Q_OBJECT public: - PrefUserInterface(QPrefs * form, QWidget * parent = 0); + PrefUserInterface(GuiPrefs * form, QWidget * parent = 0); void apply(LyXRC & rc) const; void update(LyXRC const & rc); @@ -336,7 +336,7 @@ public Q_SLOTS: }; -class PrefIdentity : public PrefModule, public Ui::QPrefIdentityUi +class PrefIdentity : public PrefModule, public Ui::PrefIdentityUi { Q_OBJECT public: @@ -347,11 +347,11 @@ public: }; /// -class QPrefsDialog : public QDialog, public Ui::QPrefsUi +class GuiPrefsDialog : public QDialog, public Ui::PrefsUi { Q_OBJECT public: - QPrefsDialog(QPrefs *); + GuiPrefsDialog(GuiPrefs *); void apply(LyXRC & rc) const; void updateRc(LyXRC const & rc); @@ -366,18 +366,18 @@ private: void add(PrefModule * module); private: - QPrefs * form_; + GuiPrefs * form_; std::vector modules_; }; class ControlPrefs; -class QPrefs - : public QController > +class GuiPrefs + : public QController > { public: - QPrefs(Dialog &); + GuiPrefs(Dialog &); Converters & converters(); Formats & formats(); diff --git a/src/frontends/qt4/QPrint.cpp b/src/frontends/qt4/GuiPrint.cpp similarity index 82% rename from src/frontends/qt4/QPrint.cpp rename to src/frontends/qt4/GuiPrint.cpp index 614f7264f3..302b0b73a0 100644 --- a/src/frontends/qt4/QPrint.cpp +++ b/src/frontends/qt4/GuiPrint.cpp @@ -1,5 +1,5 @@ /** - * \file QPrint.cpp + * \file GuiPrint.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,8 +11,8 @@ #include -#include "QPrint.h" -#include "QLPrintDialog.h" +#include "GuiPrint.h" +#include "GuiPrintDialog.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -22,36 +22,36 @@ #include "support/os.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using lyx::support::os::internal_path; namespace lyx { namespace frontend { -typedef QController > print_base_class; +typedef QController > print_base_class; -QPrint::QPrint(Dialog & parent) +GuiPrint::GuiPrint(Dialog & parent) : print_base_class(parent, _("Print Document")) { } -void QPrint::build_dialog() +void GuiPrint::build_dialog() { - dialog_.reset(new QLPrintDialog(this)); + dialog_.reset(new GuiPrintDialog(this)); bcview().setOK(dialog_->printPB); bcview().setCancel(dialog_->closePB); } -void QPrint::update_contents() +void GuiPrint::update_contents() { PrinterParams & pp = controller().params(); @@ -90,7 +90,7 @@ void QPrint::update_contents() } -void QPrint::apply() +void GuiPrint::apply() { PrinterParams::Target t = PrinterParams::PRINTER; if (dialog_->fileRB->isChecked()) diff --git a/src/frontends/qt4/QPrint.h b/src/frontends/qt4/GuiPrint.h similarity index 74% rename from src/frontends/qt4/QPrint.h rename to src/frontends/qt4/GuiPrint.h index d0e8b55f19..dc1a87d814 100644 --- a/src/frontends/qt4/QPrint.h +++ b/src/frontends/qt4/GuiPrint.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QPrint.h + * \file GuiPrint.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,8 +13,8 @@ #ifndef QPRINT_H #define QPRINT_H -#include "QDialogView.h" -#include "QLPrintDialog.h" +#include "GuiDialogView.h" +#include "GuiPrintDialog.h" namespace lyx { namespace frontend { @@ -22,14 +22,14 @@ namespace frontend { class ControlPrint; /// -class QPrint - : public QController > +class GuiPrint + : public QController > { public: /// - friend class QLPrintDialog; + friend class GuiPrintDialog; /// - QPrint(Dialog &); + GuiPrint(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QLPrintDialog.cpp b/src/frontends/qt4/GuiPrintDialog.cpp similarity index 85% rename from src/frontends/qt4/QLPrintDialog.cpp rename to src/frontends/qt4/GuiPrintDialog.cpp index 8c8cefe99b..c14867a7a4 100644 --- a/src/frontends/qt4/QLPrintDialog.cpp +++ b/src/frontends/qt4/GuiPrintDialog.cpp @@ -1,5 +1,5 @@ /** - * \file QLPrintDialog.cpp + * \file GuiPrintDialog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,8 +12,8 @@ #include #include "controllers/ControlPrint.h" -#include "QLPrintDialog.h" -#include "QPrint.h" +#include "GuiPrintDialog.h" +#include "GuiPrint.h" #include "qt_helpers.h" #include @@ -24,7 +24,7 @@ namespace lyx { namespace frontend { -QLPrintDialog::QLPrintDialog(QPrint * f) +GuiPrintDialog::GuiPrintDialog(GuiPrint * f) : form_(f) { setupUi(this); @@ -56,13 +56,13 @@ QLPrintDialog::QLPrintDialog(QPrint * f) } -void QLPrintDialog::change_adaptor() +void GuiPrintDialog::change_adaptor() { form_->changed(); } -void QLPrintDialog::browseClicked() +void GuiPrintDialog::browseClicked() { QString file = toqstr(form_->controller().browse(docstring())); if (!file.isNull()) { @@ -72,7 +72,7 @@ void QLPrintDialog::browseClicked() } -void QLPrintDialog::fileChanged() +void GuiPrintDialog::fileChanged() { if (!fileED->text().isEmpty()) fileRB->setChecked(true); @@ -80,21 +80,21 @@ void QLPrintDialog::fileChanged() } -void QLPrintDialog::copiesChanged(int i) +void GuiPrintDialog::copiesChanged(int i) { collateCB->setEnabled(i != 1); form_->changed(); } -void QLPrintDialog::printerChanged() +void GuiPrintDialog::printerChanged() { printerRB->setChecked(true); form_->changed(); } -void QLPrintDialog::pagerangeChanged() +void GuiPrintDialog::pagerangeChanged() { form_->changed(); } @@ -102,4 +102,4 @@ void QLPrintDialog::pagerangeChanged() } // namespace frontend } // namespace lyx -#include "QLPrintDialog_moc.cpp" +#include "GuiPrintDialog_moc.cpp" diff --git a/src/frontends/qt4/QLPrintDialog.h b/src/frontends/qt4/GuiPrintDialog.h similarity index 81% rename from src/frontends/qt4/QLPrintDialog.h rename to src/frontends/qt4/GuiPrintDialog.h index 12bcef78cc..aef630b697 100644 --- a/src/frontends/qt4/QLPrintDialog.h +++ b/src/frontends/qt4/GuiPrintDialog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QLPrintDialog.h + * \file GuiPrintDialog.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -20,12 +20,12 @@ namespace lyx { namespace frontend { -class QPrint; +class GuiPrint; -class QLPrintDialog : public QDialog, public Ui::QPrintUi { +class GuiPrintDialog : public QDialog, public Ui::PrintUi { Q_OBJECT public: - QLPrintDialog(QPrint * f); + GuiPrintDialog(GuiPrint * f); protected Q_SLOTS: virtual void change_adaptor(); virtual void browseClicked(); @@ -34,7 +34,7 @@ protected Q_SLOTS: virtual void printerChanged(); virtual void pagerangeChanged(); private: - QPrint * form_; + GuiPrint * form_; }; } // namespace frontend diff --git a/src/frontends/qt4/QRef.cpp b/src/frontends/qt4/GuiRef.cpp similarity index 89% rename from src/frontends/qt4/QRef.cpp rename to src/frontends/qt4/GuiRef.cpp index fa57699794..011e28f39e 100644 --- a/src/frontends/qt4/QRef.cpp +++ b/src/frontends/qt4/GuiRef.cpp @@ -1,5 +1,5 @@ /** - * \file QRef.cpp + * \file GuiRef.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QRef.h" +#include "GuiRef.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -38,11 +38,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QRefDialog +// GuiRefDialog // ///////////////////////////////////////////////////////////////////// -QRefDialog::QRefDialog(QRef * form) +GuiRefDialog::GuiRefDialog(GuiRef * form) : form_(form) { setupUi(this); @@ -77,24 +77,24 @@ QRefDialog::QRefDialog(QRef * form) setFocusProxy(refsLW); } -void QRefDialog::show() +void GuiRefDialog::show() { QDialog::show(); } -void QRefDialog::changed_adaptor() +void GuiRefDialog::changed_adaptor() { form_->changed(); } -void QRefDialog::gotoClicked() +void GuiRefDialog::gotoClicked() { form_->gotoRef(); } -void QRefDialog::selectionChanged() +void GuiRefDialog::selectionChanged() { if (form_->readOnly()) return; @@ -108,7 +108,7 @@ void QRefDialog::selectionChanged() } -void QRefDialog::refHighlighted(QListWidgetItem * sel) +void GuiRefDialog::refHighlighted(QListWidgetItem * sel) { if (form_->readOnly()) return; @@ -131,7 +131,7 @@ void QRefDialog::refHighlighted(QListWidgetItem * sel) } -void QRefDialog::refSelected(QListWidgetItem * sel) +void GuiRefDialog::refSelected(QListWidgetItem * sel) { if (form_->readOnly()) return; @@ -148,26 +148,26 @@ void QRefDialog::refSelected(QListWidgetItem * sel) } -void QRefDialog::sortToggled(bool on) +void GuiRefDialog::sortToggled(bool on) { form_->sort_ = on; form_->redoRefs(); } -void QRefDialog::updateClicked() +void GuiRefDialog::updateClicked() { form_->updateRefs(); } -void QRefDialog::reset_dialog() { +void GuiRefDialog::reset_dialog() { form_->at_ref_ = false; form_->setGotoRef(); } -void QRefDialog::closeEvent(QCloseEvent * e) +void GuiRefDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); reset_dialog(); @@ -177,24 +177,24 @@ void QRefDialog::closeEvent(QCloseEvent * e) ///////////////////////////////////////////////////////////////////// // -// QRef +// GuiRef // ///////////////////////////////////////////////////////////////////// // full qualification because qt4 has also a ControlRef type -typedef QController > RefBase; +typedef QController > RefBase; -QRef::QRef(Dialog & parent) +GuiRef::GuiRef(Dialog & parent) : RefBase(parent, _("Cross-reference")), sort_(false), at_ref_(false) { } -void QRef::build_dialog() +void GuiRef::build_dialog() { - dialog_.reset(new QRefDialog(this)); + dialog_.reset(new GuiRefDialog(this)); bcview().setOK(dialog_->okPB); bcview().setApply(dialog_->applyPB); @@ -210,7 +210,7 @@ void QRef::build_dialog() } -void QRef::update_contents() +void GuiRef::update_contents() { InsetCommandParams const & params = controller().params(); @@ -251,7 +251,7 @@ void QRef::update_contents() } -void QRef::apply() +void GuiRef::apply() { InsetCommandParams & params = controller().params(); @@ -265,7 +265,7 @@ void QRef::apply() } -bool QRef::nameAllowed() +bool GuiRef::nameAllowed() { Kernel::DocType const doc_type = kernel().docType(); return doc_type != Kernel::LATEX && @@ -273,14 +273,14 @@ bool QRef::nameAllowed() } -bool QRef::typeAllowed() +bool GuiRef::typeAllowed() { Kernel::DocType const doc_type = kernel().docType(); return doc_type != Kernel::DOCBOOK; } -void QRef::setGoBack() +void GuiRef::setGoBack() { dialog_->gotoPB->setText(qt_("&Go Back")); dialog_->gotoPB->setToolTip(""); @@ -288,7 +288,7 @@ void QRef::setGoBack() } -void QRef::setGotoRef() +void GuiRef::setGotoRef() { dialog_->gotoPB->setText(qt_("&Go to Label")); dialog_->gotoPB->setToolTip(""); @@ -296,7 +296,7 @@ void QRef::setGotoRef() } -void QRef::gotoRef() +void GuiRef::gotoRef() { string ref(fromqstr(dialog_->referenceED->text())); @@ -313,7 +313,7 @@ void QRef::gotoRef() } -void QRef::redoRefs() +void GuiRef::redoRefs() { // Prevent these widgets from emitting any signals whilst // we modify their state. @@ -366,7 +366,7 @@ void QRef::redoRefs() } -void QRef::updateRefs() +void GuiRef::updateRefs() { refs_.clear(); string const name = controller().getBufferName(dialog_->bufferCO->currentIndex()); @@ -377,7 +377,7 @@ void QRef::updateRefs() redoRefs(); } -bool QRef::isValid() +bool GuiRef::isValid() { return !dialog_->referenceED->text().isEmpty(); } @@ -385,4 +385,4 @@ bool QRef::isValid() } // namespace frontend } // namespace lyx -#include "QRef_moc.cpp" +#include "GuiRef_moc.cpp" diff --git a/src/frontends/qt4/QRef.h b/src/frontends/qt4/GuiRef.h similarity index 85% rename from src/frontends/qt4/QRef.h rename to src/frontends/qt4/GuiRef.h index 02c73ae680..63773beada 100644 --- a/src/frontends/qt4/QRef.h +++ b/src/frontends/qt4/GuiRef.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QRef.h + * \file GuiRef.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QREF_H #define QREF_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_RefUi.h" @@ -26,12 +26,12 @@ class QCloseEvent; namespace lyx { namespace frontend { -class QRef; +class GuiRef; -class QRefDialog : public QDialog, public Ui::QRefUi { +class GuiRefDialog : public QDialog, public Ui::RefUi { Q_OBJECT public: - QRefDialog(QRef * form); + GuiRefDialog(GuiRef * form); virtual void show(); @@ -49,20 +49,20 @@ protected Q_SLOTS: protected: void closeEvent(QCloseEvent * e); private: - QRef * form_; + GuiRef * form_; }; class ControlRef; // full qualification because qt4 has also a ControlRef type -class QRef - : public QController > +class GuiRef + : public QController > { public: - friend class QRefDialog; + friend class GuiRefDialog; - QRef(Dialog &); + GuiRef(Dialog &); protected: virtual bool isValid(); diff --git a/src/frontends/qt4/QSearch.cpp b/src/frontends/qt4/GuiSearch.cpp similarity index 81% rename from src/frontends/qt4/QSearch.cpp rename to src/frontends/qt4/GuiSearch.cpp index 8a646259cd..0c711d923c 100644 --- a/src/frontends/qt4/QSearch.cpp +++ b/src/frontends/qt4/GuiSearch.cpp @@ -1,5 +1,5 @@ /** - * \file QSearch.cpp + * \file GuiSearch.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QSearch.h" +#include "GuiSearch.h" #include "qt_helpers.h" #include "Qt2BC.h" @@ -28,7 +28,7 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QSearchDialog +// GuiSearchDialog // ///////////////////////////////////////////////////////////////////// @@ -44,7 +44,7 @@ static void uniqueInsert(QComboBox * box, QString const & text) } -QSearchDialog::QSearchDialog(QSearch * form) +GuiSearchDialog::GuiSearchDialog(GuiSearch * form) : form_(form) { setupUi(this); @@ -60,21 +60,21 @@ QSearchDialog::QSearchDialog(QSearch * form) } -void QSearchDialog::show() +void GuiSearchDialog::show() { QDialog::show(); findCO->lineEdit()->setSelection(0, findCO->lineEdit()->text().length()); } -void QSearchDialog::closeEvent(QCloseEvent * e) +void GuiSearchDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QSearchDialog::findChanged() +void GuiSearchDialog::findChanged() { if (findCO->currentText().isEmpty()) { findPB->setEnabled(false); @@ -88,7 +88,7 @@ void QSearchDialog::findChanged() } -void QSearchDialog::findClicked() +void GuiSearchDialog::findClicked() { docstring const find = qstring_to_ucs4(findCO->currentText()); form_->find(find, @@ -100,7 +100,7 @@ void QSearchDialog::findClicked() } -void QSearchDialog::replaceClicked() +void GuiSearchDialog::replaceClicked() { docstring const find = qstring_to_ucs4(findCO->currentText()); docstring const replace = qstring_to_ucs4(replaceCO->currentText()); @@ -113,7 +113,7 @@ void QSearchDialog::replaceClicked() } -void QSearchDialog::replaceallClicked() +void GuiSearchDialog::replaceallClicked() { form_->replace(qstring_to_ucs4(findCO->currentText()), qstring_to_ucs4(replaceCO->currentText()), @@ -127,23 +127,23 @@ void QSearchDialog::replaceallClicked() ///////////////////////////////////////////////////////////////////// // -// QSearch +// GuiSearch // ///////////////////////////////////////////////////////////////////// -typedef QController > SearchBase; +typedef QController > SearchBase; -QSearch::QSearch(Dialog & parent) +GuiSearch::GuiSearch(Dialog & parent) : SearchBase(parent, _("Find and Replace")) { } -void QSearch::build_dialog() +void GuiSearch::build_dialog() { - dialog_.reset(new QSearchDialog(this)); + dialog_.reset(new GuiSearchDialog(this)); bcview().setCancel(dialog_->closePB); bcview().addReadOnly(dialog_->replaceCO); @@ -155,14 +155,14 @@ void QSearch::build_dialog() } -void QSearch::find(docstring const & str, bool casesens, +void GuiSearch::find(docstring const & str, bool casesens, bool words, bool backwards) { controller().find(str, casesens, words, !backwards); } -void QSearch::replace(docstring const & findstr, docstring const & replacestr, +void GuiSearch::replace(docstring const & findstr, docstring const & replacestr, bool casesens, bool words, bool backwards, bool all) { controller().replace(findstr, replacestr, casesens, words, @@ -173,4 +173,4 @@ void QSearch::replace(docstring const & findstr, docstring const & replacestr, } // namespace lyx -#include "QSearch_moc.cpp" +#include "GuiSearch_moc.cpp" diff --git a/src/frontends/qt4/QSearch.h b/src/frontends/qt4/GuiSearch.h similarity index 78% rename from src/frontends/qt4/QSearch.h rename to src/frontends/qt4/GuiSearch.h index cae5417ef0..c3267345a9 100644 --- a/src/frontends/qt4/QSearch.h +++ b/src/frontends/qt4/GuiSearch.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QSearch.h + * \file GuiSearch.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QSEARCH_H #define QSEARCH_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_SearchUi.h" #include @@ -23,12 +23,12 @@ namespace frontend { class ControlSearch; -class QSearch; +class GuiSearch; -class QSearchDialog : public QDialog, public Ui::QSearchUi { +class GuiSearchDialog : public QDialog, public Ui::SearchUi { Q_OBJECT public: - QSearchDialog(QSearch * form); + GuiSearchDialog(GuiSearch * form); virtual void show(); protected Q_SLOTS: @@ -43,18 +43,18 @@ private: // add a string to the combo if needed void remember(std::string const & find, QComboBox & combo); - QSearch * form_; + GuiSearch * form_; }; -class QSearch - : public QController > +class GuiSearch + : public QController > { public: /// - friend class QSearchDialog; + friend class GuiSearchDialog; /// - QSearch(Dialog &); + GuiSearch(Dialog &); private: /// Apply changes virtual void apply() {} diff --git a/src/frontends/qt4/QSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp similarity index 85% rename from src/frontends/qt4/QSelectionManager.cpp rename to src/frontends/qt4/GuiSelectionManager.cpp index 0779e35bc9..d4c1fe233e 100644 --- a/src/frontends/qt4/QSelectionManager.cpp +++ b/src/frontends/qt4/GuiSelectionManager.cpp @@ -1,5 +1,5 @@ /** - * \file QSelectionManager.cpp + * \file GuiSelectionManager.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -7,19 +7,19 @@ * \author Et Alia * * Some of the material in this file previously appeared in - * QCitationDialog.cpp. + * GuiCitationDialog.cpp. * * Full author contact details are available in file CREDITS. */ #include -#include "QSelectionManager.h" +#include "GuiSelectionManager.h" namespace lyx { namespace frontend { -QSelectionManager::QSelectionManager( +GuiSelectionManager::GuiSelectionManager( QListView * avail, QListView * sel, QPushButton * add, @@ -67,7 +67,8 @@ QSelectionManager::QSelectionManager( } -void QSelectionManager::update() { +void GuiSelectionManager::update() +{ int const arows = availableLV->model()->rowCount(); QModelIndexList const availSels = availableLV->selectionModel()->selectedIndexes(); @@ -85,14 +86,14 @@ void QSelectionManager::update() { } -bool QSelectionManager::isSelected(const QModelIndex & idx) +bool GuiSelectionManager::isSelected(const QModelIndex & idx) { QString const str = idx.data().toString(); return selectedModel->stringList().contains(str); } -void QSelectionManager::availableChanged(const QModelIndex & idx, const QModelIndex &) +void GuiSelectionManager::availableChanged(const QModelIndex & idx, const QModelIndex &) { if (!idx.isValid()) return; @@ -102,7 +103,7 @@ void QSelectionManager::availableChanged(const QModelIndex & idx, const QModelIn } -void QSelectionManager::selectedChanged(const QModelIndex & idx, const QModelIndex &) +void GuiSelectionManager::selectedChanged(const QModelIndex & idx, const QModelIndex &) { if (!idx.isValid()) return; @@ -112,21 +113,18 @@ void QSelectionManager::selectedChanged(const QModelIndex & idx, const QModelInd } -namespace { -//helper function for next two - QModelIndex getSelectedIndex(QListView * lv) { - //Encourage compiler to use NRVO - QModelIndex retval = QModelIndex(); - QModelIndexList selIdx = - lv->selectionModel()->selectedIndexes(); - if (!selIdx.empty()) - retval = selIdx.first(); - return retval; - } -}//anonymous namespace +static QModelIndex getSelectedIndex(QListView * lv) +{ + QModelIndex retval = QModelIndex(); + QModelIndexList selIdx = + lv->selectionModel()->selectedIndexes(); + if (!selIdx.empty()) + retval = selIdx.first(); + return retval; +} -void QSelectionManager::addPB_clicked() +void GuiSelectionManager::addPB_clicked() { QModelIndex const idxToAdd = getSelectedIndex(availableLV); if (!idxToAdd.isValid()) @@ -144,7 +142,7 @@ void QSelectionManager::addPB_clicked() } -void QSelectionManager::deletePB_clicked() +void GuiSelectionManager::deletePB_clicked() { QModelIndex idx = getSelectedIndex(selectedLV); if (!idx.isValid()) @@ -168,7 +166,7 @@ void QSelectionManager::deletePB_clicked() } -void QSelectionManager::upPB_clicked() +void GuiSelectionManager::upPB_clicked() { QModelIndex idx = selectedLV->currentIndex(); @@ -184,7 +182,7 @@ void QSelectionManager::upPB_clicked() } -void QSelectionManager::downPB_clicked() +void GuiSelectionManager::downPB_clicked() { QModelIndex idx = selectedLV->currentIndex(); @@ -204,14 +202,14 @@ void QSelectionManager::downPB_clicked() //can enter the QListView in other ways. But there are no signals sent //in that case. We need to reimplement focusInEvent() to capture those, //which means subclassing QListView. (rgh) -void QSelectionManager::availableLV_clicked(const QModelIndex &) +void GuiSelectionManager::availableLV_clicked(const QModelIndex &) { selectedHasFocus_ = false; updateHook(); } -void QSelectionManager::availableLV_doubleClicked(const QModelIndex & idx) +void GuiSelectionManager::availableLV_doubleClicked(const QModelIndex & idx) { if (isSelected(idx)) return; @@ -223,14 +221,14 @@ void QSelectionManager::availableLV_doubleClicked(const QModelIndex & idx) } -void QSelectionManager::selectedLV_clicked(const QModelIndex &) +void GuiSelectionManager::selectedLV_clicked(const QModelIndex &) { selectedHasFocus_ = true; updateHook(); } -bool QSelectionManager::eventFilter(QObject * obj, QEvent * event) +bool GuiSelectionManager::eventFilter(QObject * obj, QEvent * event) { if (obj == availableLV) { if (event->type() != QEvent::KeyPress) @@ -288,4 +286,4 @@ bool QSelectionManager::eventFilter(QObject * obj, QEvent * event) }//namespace frontend }//namespace lyx -#include "QSelectionManager_moc.cpp" +#include "GuiSelectionManager_moc.cpp" diff --git a/src/frontends/qt4/QSelectionManager.h b/src/frontends/qt4/GuiSelectionManager.h similarity index 94% rename from src/frontends/qt4/QSelectionManager.h rename to src/frontends/qt4/GuiSelectionManager.h index 1044979bec..9392a1c99d 100644 --- a/src/frontends/qt4/QSelectionManager.h +++ b/src/frontends/qt4/GuiSelectionManager.h @@ -1,5 +1,5 @@ /** - * \file QSelectionManager.h + * \file GuiSelectionManager.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -20,23 +20,24 @@ #include #include + namespace lyx { namespace frontend { /** Class to manage a collection of widgets that allows selection * of items from a list of available items. Adapted from code originally - * written for QCitationDialog. + * written for GuiCitationDialog. * Note that this is a not a QWidget, though it could be converted to * one. Rather, the managed widgets---see constructor for descripton * of them---should be created independently, and then passed to the * constructor. */ -class QSelectionManager: public QObject { +class GuiSelectionManager : public QObject { Q_OBJECT public: /// - QSelectionManager( + GuiSelectionManager( QListView * availableLV, QListView * selectedLV, QPushButton * addPB, @@ -113,6 +114,8 @@ class QSelectionManager: public QObject { bool selectedHasFocus_; }; -}//namespace frontend -}//namespace lyx + +} // namespace frontend +} // namespace lyx + #endif diff --git a/src/frontends/qt4/QSendto.cpp b/src/frontends/qt4/GuiSendto.cpp similarity index 85% rename from src/frontends/qt4/QSendto.cpp rename to src/frontends/qt4/GuiSendto.cpp index 2a673d292c..72de66bb7f 100644 --- a/src/frontends/qt4/QSendto.cpp +++ b/src/frontends/qt4/GuiSendto.cpp @@ -1,5 +1,5 @@ /** - * \file QSendto.cpp + * \file GuiSendto.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QSendto.h" +#include "GuiSendto.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -31,11 +31,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QSendtoDialog +// GuiSendtoDialog // ///////////////////////////////////////////////////////////////////// -QSendtoDialog::QSendtoDialog(QSendto * form) +GuiSendtoDialog::GuiSendtoDialog(GuiSendto * form) : form_(form) { setupUi(this); @@ -58,13 +58,13 @@ QSendtoDialog::QSendtoDialog(QSendto * form) } -void QSendtoDialog::changed_adaptor() +void GuiSendtoDialog::changed_adaptor() { form_->changed(); } -void QSendtoDialog::closeEvent(QCloseEvent * e) +void GuiSendtoDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); @@ -73,22 +73,22 @@ void QSendtoDialog::closeEvent(QCloseEvent * e) ///////////////////////////////////////////////////////////////////// // -// QSendto +// GuiSendto // ///////////////////////////////////////////////////////////////////// -typedef QController > SendtoBase; +typedef QController > SendtoBase; -QSendto::QSendto(Dialog & parent) +GuiSendto::GuiSendto(Dialog & parent) : SendtoBase(parent, _("Send Document to Command")) { } -void QSendto::build_dialog() +void GuiSendto::build_dialog() { - dialog_.reset(new QSendtoDialog(this)); + dialog_.reset(new GuiSendtoDialog(this)); // Manage the ok, apply, restore and cancel/close buttons bcview().setOK(dialog_->okPB); @@ -97,7 +97,7 @@ void QSendto::build_dialog() } -void QSendto::update_contents() +void GuiSendto::update_contents() { all_formats_ = controller().allFormats(); @@ -125,7 +125,7 @@ void QSendto::update_contents() } -void QSendto::apply() +void GuiSendto::apply() { int const line(dialog_->formatLW->currentRow()); @@ -139,7 +139,7 @@ void QSendto::apply() } -bool QSendto::isValid() +bool GuiSendto::isValid() { int const line(dialog_->formatLW->currentRow()); @@ -153,4 +153,4 @@ bool QSendto::isValid() } // namespace frontend } // namespace lyx -#include "QSendto_moc.cpp" +#include "GuiSendto_moc.cpp" diff --git a/src/frontends/qt4/QSendto.h b/src/frontends/qt4/GuiSendto.h similarity index 77% rename from src/frontends/qt4/QSendto.h rename to src/frontends/qt4/GuiSendto.h index dc41f300ca..4e4f3ba670 100644 --- a/src/frontends/qt4/QSendto.h +++ b/src/frontends/qt4/GuiSendto.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QSendto.h + * \file GuiSendto.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QSENDTO_H #define QSENDTO_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_SendtoUi.h" #include @@ -28,12 +28,12 @@ class Format; namespace frontend { -class QSendto; +class GuiSendto; -class QSendtoDialog : public QDialog, public Ui::QSendtoUi { +class GuiSendtoDialog : public QDialog, public Ui::SendtoUi { Q_OBJECT public: - QSendtoDialog(QSendto * form); + GuiSendtoDialog(GuiSendto * form); protected Q_SLOTS: virtual void changed_adaptor(); virtual void slotFormatHighlighted(QListWidgetItem *) {} @@ -41,7 +41,7 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QSendto * form_; + GuiSendto * form_; }; @@ -49,14 +49,14 @@ class ControlSendto; /** This class provides a Qt implementation of the Custom Export Dialog. */ -class QSendto - : public QController > +class GuiSendto + : public QController > { public: /// - friend class QSendtoDialog; + friend class GuiSendtoDialog; /// - QSendto(Dialog &); + GuiSendto(Dialog &); protected: virtual bool isValid(); private: diff --git a/src/frontends/qt4/QSetBorder.cpp b/src/frontends/qt4/GuiSetBorder.cpp similarity index 75% rename from src/frontends/qt4/QSetBorder.cpp rename to src/frontends/qt4/GuiSetBorder.cpp index c2e53a7a52..adc1162d3a 100644 --- a/src/frontends/qt4/QSetBorder.cpp +++ b/src/frontends/qt4/GuiSetBorder.cpp @@ -1,5 +1,5 @@ /** - * \file QSetBorder.cpp + * \file GuiSetBorder.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,16 +11,14 @@ #include -#include "QSetBorder.h" +#include "GuiSetBorder.h" #include - -//Added by qt3to4: #include #include -QSetBorder::QSetBorder(QWidget * parent, Qt::WFlags fl) +GuiSetBorder::GuiSetBorder(QWidget * parent, Qt::WFlags fl) : QWidget(parent, fl), buffer(75, 75) { /* length of corner line */ @@ -38,7 +36,7 @@ QSetBorder::QSetBorder(QWidget * parent, Qt::WFlags fl) } -void QSetBorder::paintEvent(QPaintEvent * e) +void GuiSetBorder::paintEvent(QPaintEvent * e) { QWidget::paintEvent(e); QPainter painter(this); @@ -46,7 +44,7 @@ void QSetBorder::paintEvent(QPaintEvent * e) } -void QSetBorder::init() +void GuiSetBorder::init() { buffer.fill(); QPainter paint(&buffer); @@ -69,7 +67,7 @@ void QSetBorder::init() } -void QSetBorder::mousePressEvent(QMouseEvent * e) +void GuiSetBorder::mousePressEvent(QMouseEvent * e) { if (e->y() > e->x()) { if (e->y() < height() - e->x()) { @@ -106,7 +104,7 @@ void QSetBorder::mousePressEvent(QMouseEvent * e) } -void QSetBorder::drawLine(QColor const & col, int x, int y, int x2, int y2) +void GuiSetBorder::drawLine(QColor const & col, int x, int y, int x2, int y2) { QPainter paint(&buffer); QPen p = paint.pen(); @@ -117,7 +115,7 @@ void QSetBorder::drawLine(QColor const & col, int x, int y, int x2, int y2) } -void QSetBorder::drawLeft(bool draw) +void GuiSetBorder::drawLeft(bool draw) { QColor col(draw ? Qt::black : Qt::white); if (!left_.enabled) @@ -126,7 +124,7 @@ void QSetBorder::drawLeft(bool draw) } -void QSetBorder::drawRight(bool draw) +void GuiSetBorder::drawRight(bool draw) { QColor col(draw ? Qt::black : Qt::white); if (!right_.enabled) @@ -135,7 +133,7 @@ void QSetBorder::drawRight(bool draw) } -void QSetBorder::drawTop(bool draw) +void GuiSetBorder::drawTop(bool draw) { QColor col(draw ? Qt::black : Qt::white); if (!top_.enabled) @@ -144,7 +142,7 @@ void QSetBorder::drawTop(bool draw) } -void QSetBorder::drawBottom(bool draw) +void GuiSetBorder::drawBottom(bool draw) { QColor col(draw ? Qt::black : Qt::white); if (!bottom_.enabled) @@ -153,63 +151,63 @@ void QSetBorder::drawBottom(bool draw) } -void QSetBorder::setLeftEnabled(bool border) +void GuiSetBorder::setLeftEnabled(bool border) { left_.enabled = border; drawLeft(border); } -void QSetBorder::setRightEnabled(bool border) +void GuiSetBorder::setRightEnabled(bool border) { right_.enabled = border; drawRight(border); } -void QSetBorder::setTopEnabled(bool border) +void GuiSetBorder::setTopEnabled(bool border) { top_.enabled = border; drawTop(border); } -void QSetBorder::setBottomEnabled(bool border) +void GuiSetBorder::setBottomEnabled(bool border) { bottom_.enabled = border; drawBottom(border); } -void QSetBorder::setLeft(bool border) +void GuiSetBorder::setLeft(bool border) { left_.set = border; drawLeft(border); } -void QSetBorder::setRight(bool border) +void GuiSetBorder::setRight(bool border) { right_.set = border; drawRight(border); } -void QSetBorder::setTop(bool border) +void GuiSetBorder::setTop(bool border) { top_.set = border; drawTop(border); } -void QSetBorder::setBottom(bool border) +void GuiSetBorder::setBottom(bool border) { bottom_.set = border; drawBottom(border); } -void QSetBorder::setAll(bool border) +void GuiSetBorder::setAll(bool border) { setLeft(border); setRight(border); @@ -218,33 +216,27 @@ void QSetBorder::setAll(bool border) } -bool QSetBorder::getLeft() +bool GuiSetBorder::getLeft() { return left_.set; } -bool QSetBorder::getRight() +bool GuiSetBorder::getRight() { return right_.set; } -bool QSetBorder::getTop() +bool GuiSetBorder::getTop() { return top_.set; } -bool QSetBorder::getBottom() +bool GuiSetBorder::getBottom() { return bottom_.set; } -#include "QSetBorder_moc.cpp" - - -namespace lyx { - - -} // namespace lyx +#include "GuiSetBorder_moc.cpp" diff --git a/src/frontends/qt4/QSetBorder.h b/src/frontends/qt4/GuiSetBorder.h similarity index 92% rename from src/frontends/qt4/QSetBorder.h rename to src/frontends/qt4/GuiSetBorder.h index 2c53bea6a2..2da560cc27 100644 --- a/src/frontends/qt4/QSetBorder.h +++ b/src/frontends/qt4/GuiSetBorder.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QSetBorder.h + * \file GuiSetBorder.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -21,11 +21,11 @@ class QPaintEvent; //namespace lyx { -class QSetBorder : public QWidget +class GuiSetBorder : public QWidget { Q_OBJECT public: - QSetBorder(QWidget * parent = 0, Qt::WFlags fl = 0); + GuiSetBorder(QWidget * parent = 0, Qt::WFlags fl = 0); bool getLeft(); bool getRight(); diff --git a/src/frontends/qt4/QShowFile.cpp b/src/frontends/qt4/GuiShowFile.cpp similarity index 73% rename from src/frontends/qt4/QShowFile.cpp rename to src/frontends/qt4/GuiShowFile.cpp index 3687ff887a..4de8c4e732 100644 --- a/src/frontends/qt4/QShowFile.cpp +++ b/src/frontends/qt4/GuiShowFile.cpp @@ -1,5 +1,5 @@ /** - * \file QShowFile.cpp + * \file GuiShowFile.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QShowFile.h" +#include "GuiShowFile.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -24,11 +24,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QShowFileDialog +// GuiShowFileDialog // ///////////////////////////////////////////////////////////////////// -QShowFileDialog::QShowFileDialog(QShowFile * form) +GuiShowFileDialog::GuiShowFileDialog(GuiShowFile * form) : form_(form) { setupUi(this); @@ -36,7 +36,7 @@ QShowFileDialog::QShowFileDialog(QShowFile * form) } -void QShowFileDialog::closeEvent(QCloseEvent * e) +void GuiShowFileDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); @@ -45,29 +45,29 @@ void QShowFileDialog::closeEvent(QCloseEvent * e) ///////////////////////////////////////////////////////////////////// // -// QShowFile +// GuiShowFile // ///////////////////////////////////////////////////////////////////// -typedef QController > +typedef QController > ShowFileBase; -QShowFile::QShowFile(Dialog & parent) +GuiShowFile::GuiShowFile(Dialog & parent) : ShowFileBase(parent, _("Show File")) { } -void QShowFile::build_dialog() +void GuiShowFile::build_dialog() { - dialog_.reset(new QShowFileDialog(this)); + dialog_.reset(new GuiShowFileDialog(this)); bcview().setCancel(dialog_->closePB); } -void QShowFile::update_contents() +void GuiShowFile::update_contents() { dialog_->setWindowTitle(toqstr(controller().getFileName())); @@ -82,4 +82,4 @@ void QShowFile::update_contents() } // namespace frontend } // namespace lyx -#include "QShowFile_moc.cpp" +#include "GuiShowFile_moc.cpp" diff --git a/src/frontends/qt4/QShowFile.h b/src/frontends/qt4/GuiShowFile.h similarity index 67% rename from src/frontends/qt4/QShowFile.h rename to src/frontends/qt4/GuiShowFile.h index 24ba3e7ca3..3c43cd9913 100644 --- a/src/frontends/qt4/QShowFile.h +++ b/src/frontends/qt4/GuiShowFile.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QShowFile.h + * \file GuiShowFile.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QSHOWFILE_H #define QSHOWFILE_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_ShowFileUi.h" @@ -22,28 +22,28 @@ namespace lyx { namespace frontend { -class QShowFile; +class GuiShowFile; -class QShowFileDialog : public QDialog, public Ui::QShowFileUi { +class GuiShowFileDialog : public QDialog, public Ui::ShowFileUi { Q_OBJECT public: - QShowFileDialog(QShowFile * form); + GuiShowFileDialog(GuiShowFile * form); protected: virtual void closeEvent(QCloseEvent * e); private: - QShowFile * form_; + GuiShowFile * form_; }; class ControlShowFile; -class QShowFile - : public QController > +class GuiShowFile + : public QController > { public: - friend class QShowFileDialog; + friend class GuiShowFileDialog; - QShowFile(Dialog &); + GuiShowFile(Dialog &); private: /// Apply changes virtual void apply() {} diff --git a/src/frontends/qt4/QSpellchecker.cpp b/src/frontends/qt4/GuiSpellchecker.cpp similarity index 76% rename from src/frontends/qt4/QSpellchecker.cpp rename to src/frontends/qt4/GuiSpellchecker.cpp index a09bc4e3a6..356b0becb4 100644 --- a/src/frontends/qt4/QSpellchecker.cpp +++ b/src/frontends/qt4/GuiSpellchecker.cpp @@ -1,5 +1,5 @@ /** - * \file QSpellchecker.cpp + * \file GuiSpellchecker.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QSpellchecker.h" +#include "GuiSpellchecker.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -34,12 +34,12 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QSpellCheckerDialog +// GuiSpellCheckerDialog // ///////////////////////////////////////////////////////////////////// -QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form) +GuiSpellcheckerDialog::GuiSpellcheckerDialog(GuiSpellchecker * form) : form_(form) { setupUi(this); @@ -63,27 +63,27 @@ QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form) } -void QSpellcheckerDialog::acceptClicked() +void GuiSpellcheckerDialog::acceptClicked() { form_->accept(); } -void QSpellcheckerDialog::addClicked() +void GuiSpellcheckerDialog::addClicked() { form_->add(); } -void QSpellcheckerDialog::replaceClicked() +void GuiSpellcheckerDialog::replaceClicked() { form_->replace(); } -void QSpellcheckerDialog::ignoreClicked() +void GuiSpellcheckerDialog::ignoreClicked() { form_->ignore(); } -void QSpellcheckerDialog::suggestionChanged(QListWidgetItem * item) +void GuiSpellcheckerDialog::suggestionChanged(QListWidgetItem * item) { if (replaceCO->count() != 0) replaceCO->setItemText(0, item->text()); @@ -93,7 +93,7 @@ void QSpellcheckerDialog::suggestionChanged(QListWidgetItem * item) replaceCO->setCurrentIndex(0); } -void QSpellcheckerDialog::replaceChanged(const QString & str) +void GuiSpellcheckerDialog::replaceChanged(const QString & str) { if (suggestionsLW->currentItem()->text() == str) return; @@ -107,14 +107,14 @@ void QSpellcheckerDialog::replaceChanged(const QString & str) } -void QSpellcheckerDialog::closeEvent(QCloseEvent * e) +void GuiSpellcheckerDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QSpellcheckerDialog::reject() +void GuiSpellcheckerDialog::reject() { form_->slotWMHide(); QDialog::reject(); @@ -124,59 +124,59 @@ void QSpellcheckerDialog::reject() ///////////////////////////////////////////////////////////////////// // -// QSpellChecker +// GuiSpellChecker // ///////////////////////////////////////////////////////////////////// -typedef QController > +typedef QController > SpellcheckerBase; -QSpellchecker::QSpellchecker(Dialog & parent) +GuiSpellchecker::GuiSpellchecker(Dialog & parent) : SpellcheckerBase(parent, _("Spellchecker")) {} -void QSpellchecker::build_dialog() +void GuiSpellchecker::build_dialog() { - dialog_.reset(new QSpellcheckerDialog(this)); + dialog_.reset(new GuiSpellcheckerDialog(this)); bcview().setCancel(dialog_->closePB); dialog_->wordED->setReadOnly(true); } -void QSpellchecker::update_contents() +void GuiSpellchecker::update_contents() { if (isVisible() || controller().exitEarly()) controller().check(); } -void QSpellchecker::accept() +void GuiSpellchecker::accept() { controller().ignoreAll(); } -void QSpellchecker::add() +void GuiSpellchecker::add() { controller().insert(); } -void QSpellchecker::ignore() +void GuiSpellchecker::ignore() { controller().check(); } -void QSpellchecker::replace() +void GuiSpellchecker::replace() { controller().replace(qstring_to_ucs4(dialog_->replaceCO->currentText())); } -void QSpellchecker::partialUpdate(int s) +void GuiSpellchecker::partialUpdate(int s) { ControlSpellchecker::State const state = static_cast(s); @@ -212,4 +212,4 @@ void QSpellchecker::partialUpdate(int s) } // namespace frontend } // namespace lyx -#include "QSpellchecker_moc.cpp" +#include "GuiSpellchecker_moc.cpp" diff --git a/src/frontends/qt4/QSpellchecker.h b/src/frontends/qt4/GuiSpellchecker.h similarity index 75% rename from src/frontends/qt4/QSpellchecker.h rename to src/frontends/qt4/GuiSpellchecker.h index b31921278d..d7c8023a30 100644 --- a/src/frontends/qt4/QSpellchecker.h +++ b/src/frontends/qt4/GuiSpellchecker.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QSpellchecker.h + * \file GuiSpellchecker.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef QSPELLCHECKER_H #define QSPELLCHECKER_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_SpellcheckerUi.h" #include @@ -24,12 +24,12 @@ class QListWidgetItem; namespace lyx { namespace frontend { -class QSpellchecker; +class GuiSpellchecker; -class QSpellcheckerDialog: public QDialog, public Ui::QSpellcheckerUi { +class GuiSpellcheckerDialog: public QDialog, public Ui::SpellcheckerUi { Q_OBJECT public: - QSpellcheckerDialog(QSpellchecker * form); + GuiSpellcheckerDialog(GuiSpellchecker * form); public Q_SLOTS: virtual void suggestionChanged(QListWidgetItem *); @@ -45,19 +45,19 @@ protected: virtual void closeEvent(QCloseEvent * e); private: - QSpellchecker * form_; + GuiSpellchecker * form_; }; class ControlSpellchecker; -class QSpellchecker - : public QController > +class GuiSpellchecker + : public QController > { public: - friend class QSpellcheckerDialog; + friend class GuiSpellcheckerDialog; - QSpellchecker(Dialog &); + GuiSpellchecker(Dialog &); /// update from controller void partialUpdate(int id); diff --git a/src/frontends/qt4/QTabular.cpp b/src/frontends/qt4/GuiTabular.cpp similarity index 92% rename from src/frontends/qt4/QTabular.cpp rename to src/frontends/qt4/GuiTabular.cpp index 73ce923fd8..3f48f43dca 100644 --- a/src/frontends/qt4/QTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -1,5 +1,5 @@ /** - * \file QTabular.cpp + * \file GuiTabular.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #include #include "CheckedLineEdit.h" -#include "QTabular.h" +#include "GuiTabular.h" #include "Qt2BC.h" #include "LengthCombo.h" @@ -31,7 +31,7 @@ #include #include -#include "QSetBorder.h" +#include "GuiSetBorder.h" using std::string; @@ -40,11 +40,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QTabularDialog +// GuiTabularDialog // ///////////////////////////////////////////////////////////////////// -QTabularDialog::QTabularDialog(QTabular * form) +GuiTabularDialog::GuiTabularDialog(GuiTabular * form) : form_(form) { setupUi(this); @@ -107,20 +107,20 @@ QTabularDialog::QTabularDialog(QTabular * form) } -void QTabularDialog::change_adaptor() +void GuiTabularDialog::change_adaptor() { form_->changed(); } -void QTabularDialog::closeEvent(QCloseEvent * e) +void GuiTabularDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QTabularDialog::booktabsChanged(bool) +void GuiTabularDialog::booktabsChanged(bool) { form_->changed(); form_->controller().booktabs(booktabsRB->isChecked()); @@ -128,7 +128,7 @@ void QTabularDialog::booktabsChanged(bool) } -void QTabularDialog::topspace_changed() +void GuiTabularDialog::topspace_changed() { switch(topspaceCO->currentIndex()) { case 0: { @@ -158,7 +158,7 @@ void QTabularDialog::topspace_changed() } -void QTabularDialog::bottomspace_changed() +void GuiTabularDialog::bottomspace_changed() { switch(bottomspaceCO->currentIndex()) { case 0: { @@ -188,7 +188,7 @@ void QTabularDialog::bottomspace_changed() } -void QTabularDialog::interlinespace_changed() +void GuiTabularDialog::interlinespace_changed() { switch(interlinespaceCO->currentIndex()) { case 0: { @@ -218,14 +218,14 @@ void QTabularDialog::interlinespace_changed() } -void QTabularDialog::close_clicked() +void GuiTabularDialog::close_clicked() { form_->closeGUI(); form_->slotClose(); } -void QTabularDialog::borderSet_clicked() +void GuiTabularDialog::borderSet_clicked() { form_->controller().set(Tabular::SET_ALL_LINES); form_->update_borders(); @@ -233,7 +233,7 @@ void QTabularDialog::borderSet_clicked() } -void QTabularDialog::borderUnset_clicked() +void GuiTabularDialog::borderUnset_clicked() { form_->controller().set(Tabular::UNSET_ALL_LINES); form_->update_borders(); @@ -241,35 +241,35 @@ void QTabularDialog::borderUnset_clicked() } -void QTabularDialog::leftBorder_changed() +void GuiTabularDialog::leftBorder_changed() { form_->controller().toggleLeftLine(); form_->changed(); } -void QTabularDialog::rightBorder_changed() +void GuiTabularDialog::rightBorder_changed() { form_->controller().toggleRightLine(); form_->changed(); } -void QTabularDialog::topBorder_changed() +void GuiTabularDialog::topBorder_changed() { form_->controller().toggleTopLine(); form_->changed(); } -void QTabularDialog::bottomBorder_changed() +void GuiTabularDialog::bottomBorder_changed() { form_->controller().toggleBottomLine(); form_->changed(); } -void QTabularDialog::specialAlignment_changed() +void GuiTabularDialog::specialAlignment_changed() { string special = fromqstr(specialAlignmentED->text()); form_->controller().setSpecial(special); @@ -277,7 +277,7 @@ void QTabularDialog::specialAlignment_changed() } -void QTabularDialog::width_changed() +void GuiTabularDialog::width_changed() { form_->changed(); string const width = widgetsToLength(widthED, widthUnit); @@ -285,28 +285,28 @@ void QTabularDialog::width_changed() } -void QTabularDialog::multicolumn_clicked() +void GuiTabularDialog::multicolumn_clicked() { form_->controller().toggleMultiColumn(); form_->changed(); } -void QTabularDialog::rotateTabular() +void GuiTabularDialog::rotateTabular() { form_->controller().rotateTabular(rotateTabularCB->isChecked()); form_->changed(); } -void QTabularDialog::rotateCell() +void GuiTabularDialog::rotateCell() { form_->controller().rotateCell(rotateCellCB->isChecked()); form_->changed(); } -void QTabularDialog::hAlign_changed(int align) +void GuiTabularDialog::hAlign_changed(int align) { ControlTabular::HALIGN h = ControlTabular::LEFT; @@ -321,7 +321,7 @@ void QTabularDialog::hAlign_changed(int align) } -void QTabularDialog::vAlign_changed(int align) +void GuiTabularDialog::vAlign_changed(int align) { ControlTabular::VALIGN v = ControlTabular::TOP; @@ -335,21 +335,21 @@ void QTabularDialog::vAlign_changed(int align) } -void QTabularDialog::longTabular() +void GuiTabularDialog::longTabular() { form_->controller().longTabular(longTabularCB->isChecked()); form_->changed(); } -void QTabularDialog::ltNewpage_clicked() +void GuiTabularDialog::ltNewpage_clicked() { form_->controller().set(Tabular::SET_LTNEWPAGE); form_->changed(); } -void QTabularDialog::ltHeaderStatus_clicked() +void GuiTabularDialog::ltHeaderStatus_clicked() { bool enable(headerStatusCB->isChecked()); if (enable) @@ -363,7 +363,7 @@ void QTabularDialog::ltHeaderStatus_clicked() } -void QTabularDialog::ltHeaderBorderAbove_clicked() +void GuiTabularDialog::ltHeaderBorderAbove_clicked() { if (headerBorderAboveCB->isChecked()) form_->controller().set(Tabular::SET_LTHEAD, "dl_above"); @@ -373,7 +373,7 @@ void QTabularDialog::ltHeaderBorderAbove_clicked() } -void QTabularDialog::ltHeaderBorderBelow_clicked() +void GuiTabularDialog::ltHeaderBorderBelow_clicked() { if (headerBorderBelowCB->isChecked()) form_->controller().set(Tabular::SET_LTHEAD, "dl_below"); @@ -383,7 +383,7 @@ void QTabularDialog::ltHeaderBorderBelow_clicked() } -void QTabularDialog::ltFirstHeaderBorderAbove_clicked() +void GuiTabularDialog::ltFirstHeaderBorderAbove_clicked() { if (firstheaderBorderAboveCB->isChecked()) form_->controller().set(Tabular::SET_LTFIRSTHEAD, "dl_above"); @@ -393,7 +393,7 @@ void QTabularDialog::ltFirstHeaderBorderAbove_clicked() } -void QTabularDialog::ltFirstHeaderBorderBelow_clicked() +void GuiTabularDialog::ltFirstHeaderBorderBelow_clicked() { if (firstheaderBorderBelowCB->isChecked()) form_->controller().set(Tabular::SET_LTFIRSTHEAD, "dl_below"); @@ -403,7 +403,7 @@ void QTabularDialog::ltFirstHeaderBorderBelow_clicked() } -void QTabularDialog::ltFirstHeaderStatus_clicked() +void GuiTabularDialog::ltFirstHeaderStatus_clicked() { bool enable(firstheaderStatusCB->isChecked()); if (enable) @@ -416,7 +416,7 @@ void QTabularDialog::ltFirstHeaderStatus_clicked() } -void QTabularDialog::ltFirstHeaderEmpty_clicked() +void GuiTabularDialog::ltFirstHeaderEmpty_clicked() { bool enable(firstheaderNoContentsCB->isChecked()); if (enable) @@ -430,7 +430,7 @@ void QTabularDialog::ltFirstHeaderEmpty_clicked() } -void QTabularDialog::ltFooterStatus_clicked() +void GuiTabularDialog::ltFooterStatus_clicked() { bool enable(footerStatusCB->isChecked()); if (enable) @@ -444,7 +444,7 @@ void QTabularDialog::ltFooterStatus_clicked() } -void QTabularDialog::ltFooterBorderAbove_clicked() +void GuiTabularDialog::ltFooterBorderAbove_clicked() { if (footerBorderAboveCB->isChecked()) form_->controller().set(Tabular::SET_LTFOOT, "dl_above"); @@ -454,7 +454,7 @@ void QTabularDialog::ltFooterBorderAbove_clicked() } -void QTabularDialog::ltFooterBorderBelow_clicked() +void GuiTabularDialog::ltFooterBorderBelow_clicked() { if (footerBorderBelowCB->isChecked()) form_->controller().set(Tabular::SET_LTFOOT, "dl_below"); @@ -464,7 +464,7 @@ void QTabularDialog::ltFooterBorderBelow_clicked() } -void QTabularDialog::ltLastFooterStatus_clicked() +void GuiTabularDialog::ltLastFooterStatus_clicked() { bool enable(lastfooterStatusCB->isChecked()); if (enable) @@ -477,7 +477,7 @@ void QTabularDialog::ltLastFooterStatus_clicked() } -void QTabularDialog::ltLastFooterBorderAbove_clicked() +void GuiTabularDialog::ltLastFooterBorderAbove_clicked() { if (lastfooterBorderAboveCB->isChecked()) form_->controller().set(Tabular::SET_LTLASTFOOT, "dl_above"); @@ -487,7 +487,7 @@ void QTabularDialog::ltLastFooterBorderAbove_clicked() } -void QTabularDialog::ltLastFooterBorderBelow_clicked() +void GuiTabularDialog::ltLastFooterBorderBelow_clicked() { if (lastfooterBorderBelowCB->isChecked()) form_->controller().set(Tabular::SET_LTLASTFOOT, "dl_below"); @@ -497,7 +497,7 @@ void QTabularDialog::ltLastFooterBorderBelow_clicked() } -void QTabularDialog::ltLastFooterEmpty_clicked() +void GuiTabularDialog::ltLastFooterEmpty_clicked() { bool enable(lastfooterNoContentsCB->isChecked()); if (enable) @@ -513,21 +513,21 @@ void QTabularDialog::ltLastFooterEmpty_clicked() ///////////////////////////////////////////////////////////////////// // -// QTabular +// GuiTabular // ///////////////////////////////////////////////////////////////////// -typedef QController > tabular_base_class; +typedef QController > tabular_base_class; -QTabular::QTabular(Dialog & parent) +GuiTabular::GuiTabular(Dialog & parent) : tabular_base_class(parent, _("Table Settings")) { } -void QTabular::build_dialog() +void GuiTabular::build_dialog() { - dialog_.reset(new QTabularDialog(this)); + dialog_.reset(new GuiTabularDialog(this)); bcview().setCancel(dialog_->closePB); @@ -583,13 +583,13 @@ void QTabular::build_dialog() } -bool QTabular::isValid() +bool GuiTabular::isValid() { return true; } -void QTabular::update_borders() +void GuiTabular::update_borders() { Tabular const & tabular = controller().tabular(); Tabular::idx_type const cell = controller().getActiveCell(); @@ -631,7 +631,7 @@ void QTabular::update_borders() } -void QTabular::update_contents() +void GuiTabular::update_contents() { controller().initialiseParams(string()); @@ -882,7 +882,7 @@ void QTabular::update_contents() } -void QTabular::closeGUI() +void GuiTabular::closeGUI() { // ugly hack to auto-apply the stuff that hasn't been // yet. don't let this continue to exist ... @@ -977,4 +977,4 @@ void QTabular::closeGUI() } // namespace frontend } // namespace lyx -#include "QTabular_moc.cpp" +#include "GuiTabular_moc.cpp" diff --git a/src/frontends/qt4/QTabular.h b/src/frontends/qt4/GuiTabular.h similarity index 87% rename from src/frontends/qt4/QTabular.h rename to src/frontends/qt4/GuiTabular.h index d76c38e4b8..79913f07ac 100644 --- a/src/frontends/qt4/QTabular.h +++ b/src/frontends/qt4/GuiTabular.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QTabular.h + * \file GuiTabular.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -15,7 +15,7 @@ #ifndef QTABULAR_H #define QTABULAR_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_TabularUi.h" @@ -25,12 +25,12 @@ namespace lyx { namespace frontend { -class QTabular; +class GuiTabular; -class QTabularDialog : public QDialog, public Ui::QTabularUi { +class GuiTabularDialog : public QDialog, public Ui::TabularUi { Q_OBJECT public: - QTabularDialog(QTabular * form); + GuiTabularDialog(GuiTabular * form); protected Q_SLOTS: virtual void change_adaptor(); @@ -74,19 +74,19 @@ protected: virtual void closeEvent(QCloseEvent * e); private: - QTabular * form_; + GuiTabular * form_; }; class ControlTabular; -class QTabular : - public QController > +class GuiTabular : + public QController > { public: - friend class QTabularDialog; + friend class GuiTabularDialog; - QTabular(Dialog &); + GuiTabular(Dialog &); protected: virtual bool isValid(); diff --git a/src/frontends/qt4/QTabularCreate.cpp b/src/frontends/qt4/GuiTabularCreate.cpp similarity index 72% rename from src/frontends/qt4/QTabularCreate.cpp rename to src/frontends/qt4/GuiTabularCreate.cpp index b888dd6677..c521063e6b 100644 --- a/src/frontends/qt4/QTabularCreate.cpp +++ b/src/frontends/qt4/GuiTabularCreate.cpp @@ -1,5 +1,5 @@ /** - * \file QTabularCreate.cpp + * \file GuiTabularCreate.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QTabularCreate.h" +#include "GuiTabularCreate.h" #include "Qt2BC.h" #include "EmptyTable.h" @@ -24,11 +24,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QTabularCreateDialog +// GuiTabularCreateDialog // ///////////////////////////////////////////////////////////////////// -QTabularCreateDialog::QTabularCreateDialog(QTabularCreate * form) +GuiTabularCreateDialog::GuiTabularCreateDialog(GuiTabularCreate * form) : form_(form) { setupUi(this); @@ -46,13 +46,13 @@ QTabularCreateDialog::QTabularCreateDialog(QTabularCreate * form) } -void QTabularCreateDialog::columnsChanged(int) +void GuiTabularCreateDialog::columnsChanged(int) { form_->changed(); } -void QTabularCreateDialog::rowsChanged(int) +void GuiTabularCreateDialog::rowsChanged(int) { form_->changed(); } @@ -60,30 +60,30 @@ void QTabularCreateDialog::rowsChanged(int) ///////////////////////////////////////////////////////////////////// // -// QTabularCreate +// GuiTabularCreate // ///////////////////////////////////////////////////////////////////// -typedef QController > +typedef QController > TabularCreateBase; -QTabularCreate::QTabularCreate(Dialog & parent) +GuiTabularCreate::GuiTabularCreate(Dialog & parent) : TabularCreateBase(parent, _("Insert Table")) { } -void QTabularCreate::build_dialog() +void GuiTabularCreate::build_dialog() { - dialog_.reset(new QTabularCreateDialog(this)); + dialog_.reset(new GuiTabularCreateDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); } -void QTabularCreate::apply() +void GuiTabularCreate::apply() { controller().params().first = dialog_->rowsSB->value(); controller().params().second = dialog_->columnsSB->value(); @@ -92,4 +92,4 @@ void QTabularCreate::apply() } // namespace frontend } // namespace lyx -#include "QTabularCreate_moc.cpp" +#include "GuiTabularCreate_moc.cpp" diff --git a/src/frontends/qt4/QTabularCreate.h b/src/frontends/qt4/GuiTabularCreate.h similarity index 65% rename from src/frontends/qt4/QTabularCreate.h rename to src/frontends/qt4/GuiTabularCreate.h index f26c231fea..cfb761b99d 100644 --- a/src/frontends/qt4/QTabularCreate.h +++ b/src/frontends/qt4/GuiTabularCreate.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QTabularCreate.h + * \file GuiTabularCreate.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QTABULARCREATE_H #define QTABULARCREATE_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_TabularCreateUi.h" #include @@ -20,30 +20,30 @@ namespace lyx { namespace frontend { -class QTabularCreate; +class GuiTabularCreate; -class QTabularCreateDialog : public QDialog, public Ui::QTabularCreateUi { +class GuiTabularCreateDialog : public QDialog, public Ui::TabularCreateUi { Q_OBJECT public: - QTabularCreateDialog(QTabularCreate * form); + GuiTabularCreateDialog(GuiTabularCreate * form); protected Q_SLOTS: virtual void columnsChanged(int); virtual void rowsChanged(int); private: - QTabularCreate * form_; + GuiTabularCreate * form_; }; class ControlTabularCreate; -class QTabularCreate - : public QController > +class GuiTabularCreate + : public QController > { public: /// - friend class QTabularCreateDialog; + friend class GuiTabularCreateDialog; /// - QTabularCreate(Dialog &); + GuiTabularCreate(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/QTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp similarity index 79% rename from src/frontends/qt4/QTexinfo.cpp rename to src/frontends/qt4/GuiTexinfo.cpp index 96cb02b35b..8070013bd2 100644 --- a/src/frontends/qt4/QTexinfo.cpp +++ b/src/frontends/qt4/GuiTexinfo.cpp @@ -1,5 +1,5 @@ /** - * \file QTexinfo.cpp + * \file GuiTexinfo.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QTexinfo.h" +#include "GuiTexinfo.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -28,12 +28,12 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QTexinfoDialog +// GuiTexinfoDialog // ///////////////////////////////////////////////////////////////////// -QTexinfoDialog::QTexinfoDialog(QTexinfo * form) +GuiTexinfoDialog::GuiTexinfoDialog(GuiTexinfo * form) : form_(form) { setupUi(this); @@ -54,20 +54,20 @@ QTexinfoDialog::QTexinfoDialog(QTexinfo * form) } -void QTexinfoDialog::change_adaptor() +void GuiTexinfoDialog::change_adaptor() { form_->changed(); } -void QTexinfoDialog::closeEvent(QCloseEvent * e) +void GuiTexinfoDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QTexinfoDialog::rescanClicked() +void GuiTexinfoDialog::rescanClicked() { // build new *Files.lst rescanTexStyles(); @@ -76,9 +76,9 @@ void QTexinfoDialog::rescanClicked() } -void QTexinfoDialog::viewClicked() +void GuiTexinfoDialog::viewClicked() { - vector::size_type const fitem = fileListLW->currentRow(); + size_t const fitem = fileListLW->currentRow(); vector const & data = form_->texdata_[form_->activeStyle]; string file = data[fitem]; if (!pathCB->isChecked()) @@ -88,7 +88,7 @@ void QTexinfoDialog::viewClicked() } -void QTexinfoDialog::update() +void GuiTexinfoDialog::update() { switch (whatStyleCO->currentIndex()) { case 0: @@ -108,7 +108,7 @@ void QTexinfoDialog::update() } -void QTexinfoDialog::enableViewPB() +void GuiTexinfoDialog::enableViewPB() { viewPB->setEnabled(fileListLW->currentRow() > -1); } @@ -117,22 +117,23 @@ void QTexinfoDialog::enableViewPB() ///////////////////////////////////////////////////////////////////// // -// QTexinfo +// GuiTexinfo // ///////////////////////////////////////////////////////////////////// -typedef QController > texinfo_base_class; +typedef QController > + texinfo_base_class; -QTexinfo::QTexinfo(Dialog & parent) +GuiTexinfo::GuiTexinfo(Dialog & parent) : texinfo_base_class(parent, _("TeX Information")), warningPosted(false), activeStyle(ControlTexinfo::cls) { } -void QTexinfo::build_dialog() +void GuiTexinfo::build_dialog() { - dialog_.reset(new QTexinfoDialog(this)); + dialog_.reset(new GuiTexinfoDialog(this)); updateStyles(ControlTexinfo::cls); @@ -140,7 +141,7 @@ void QTexinfo::build_dialog() } -void QTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle) +void GuiTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle) { ContentsType & data = texdata_[whichStyle]; bool const withFullPath = dialog_->pathCB->isChecked(); @@ -157,7 +158,7 @@ void QTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle) } -void QTexinfo::updateStyles() +void GuiTexinfo::updateStyles() { updateStyles(activeStyle); } @@ -166,4 +167,4 @@ void QTexinfo::updateStyles() } // namespace lyx -#include "QTexinfo_moc.cpp" +#include "GuiTexinfo_moc.cpp" diff --git a/src/frontends/qt4/QTexinfo.h b/src/frontends/qt4/GuiTexinfo.h similarity index 78% rename from src/frontends/qt4/QTexinfo.h rename to src/frontends/qt4/GuiTexinfo.h index 2593431a29..a021d108c0 100644 --- a/src/frontends/qt4/QTexinfo.h +++ b/src/frontends/qt4/GuiTexinfo.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QTexinfo.h + * \file GuiTexinfo.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QTEXINFO_H #define QTEXINFO_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ControlTexinfo.h" #include "ui_TexinfoUi.h" @@ -26,12 +26,12 @@ namespace lyx { namespace frontend { -class QTexinfo; +class GuiTexinfo; -class QTexinfoDialog : public QDialog, public Ui::QTexinfoUi { +class GuiTexinfoDialog : public QDialog, public Ui::TexinfoUi { Q_OBJECT public: - QTexinfoDialog(QTexinfo * form); + GuiTexinfoDialog(GuiTexinfo * form); public Q_SLOTS: virtual void update(); protected Q_SLOTS: @@ -42,18 +42,18 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QTexinfo * form_; + GuiTexinfo * form_; }; /// -class QTexinfo - : public QController > { +class GuiTexinfo + : public QController > { public: /// - friend class QTexinfoDialog; + friend class GuiTexinfoDialog; /// - QTexinfo(Dialog &); + GuiTexinfo(Dialog &); private: /// Apply changes virtual void apply() {} diff --git a/src/frontends/qt4/QThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp similarity index 78% rename from src/frontends/qt4/QThesaurus.cpp rename to src/frontends/qt4/GuiThesaurus.cpp index 431f608da6..e706fa7975 100644 --- a/src/frontends/qt4/QThesaurus.cpp +++ b/src/frontends/qt4/GuiThesaurus.cpp @@ -1,5 +1,5 @@ /** - * \file QThesaurus.cpp + * \file GuiThesaurus.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QThesaurus.h" +#include "GuiThesaurus.h" #include "Qt2BC.h" #include "qt_helpers.h" #include "debug.h" @@ -34,7 +34,7 @@ namespace frontend { // ///////////////////////////////////////////////////////////////////// -QThesaurusDialog::QThesaurusDialog(QThesaurus * form) +GuiThesaurusDialog::GuiThesaurusDialog(GuiThesaurus * form) : form_(form) { setupUi(this); @@ -61,32 +61,32 @@ QThesaurusDialog::QThesaurusDialog(QThesaurus * form) } -void QThesaurusDialog::change_adaptor() +void GuiThesaurusDialog::change_adaptor() { form_->changed(); } -void QThesaurusDialog::closeEvent(QCloseEvent * e) +void GuiThesaurusDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QThesaurusDialog::entryChanged() +void GuiThesaurusDialog::entryChanged() { updateLists(); } -void QThesaurusDialog::replaceClicked() +void GuiThesaurusDialog::replaceClicked() { form_->replace(); } -void QThesaurusDialog::selectionChanged() +void GuiThesaurusDialog::selectionChanged() { int const col = meaningsTV->currentColumn(); if (col<0 || form_->readOnly()) @@ -98,13 +98,13 @@ void QThesaurusDialog::selectionChanged() } -void QThesaurusDialog::itemClicked(QTreeWidgetItem * /*item*/, int /*col*/) +void GuiThesaurusDialog::itemClicked(QTreeWidgetItem * /*item*/, int /*col*/) { selectionChanged(); } -void QThesaurusDialog::selectionClicked(QTreeWidgetItem * item, int col) +void GuiThesaurusDialog::selectionClicked(QTreeWidgetItem * item, int col) { entryED->setText(item->text(col)); selectionChanged(); @@ -112,7 +112,7 @@ void QThesaurusDialog::selectionClicked(QTreeWidgetItem * item, int col) } -void QThesaurusDialog::updateLists() +void GuiThesaurusDialog::updateLists() { meaningsTV->clear(); meaningsTV->setUpdatesEnabled(false); @@ -138,21 +138,21 @@ void QThesaurusDialog::updateLists() ///////////////////////////////////////////////////////////////////// // -// QThesuarus +// GuiThesuarus // ///////////////////////////////////////////////////////////////////// -typedef QController > ThesaurusBase; +typedef QController > ThesaurusBase; -QThesaurus::QThesaurus(Dialog & parent) +GuiThesaurus::GuiThesaurus(Dialog & parent) : ThesaurusBase(parent, _("Thesaurus")) { } -void QThesaurus::build_dialog() +void GuiThesaurus::build_dialog() { - dialog_.reset(new QThesaurusDialog(this)); + dialog_.reset(new GuiThesaurusDialog(this)); bcview().setCancel(dialog_->closePB); bcview().setApply(dialog_->replacePB); @@ -161,7 +161,7 @@ void QThesaurus::build_dialog() } -void QThesaurus::update_contents() +void GuiThesaurus::update_contents() { dialog_->entryED->setText(toqstr(controller().text())); dialog_->replaceED->setText(""); @@ -169,7 +169,7 @@ void QThesaurus::update_contents() } -void QThesaurus::replace() +void GuiThesaurus::replace() { controller().replace(qstring_to_ucs4(dialog_->replaceED->text())); } @@ -178,4 +178,4 @@ void QThesaurus::replace() } // namespace lyx -#include "QThesaurus_moc.cpp" +#include "GuiThesaurus_moc.cpp" diff --git a/src/frontends/qt4/QThesaurus.h b/src/frontends/qt4/GuiThesaurus.h similarity index 75% rename from src/frontends/qt4/QThesaurus.h rename to src/frontends/qt4/GuiThesaurus.h index 9968443783..57b6cadd7d 100644 --- a/src/frontends/qt4/QThesaurus.h +++ b/src/frontends/qt4/GuiThesaurus.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QThesaurus.h + * \file GuiThesaurus.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QTHESAURUS_H #define QTHESAURUS_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_ThesaurusUi.h" #include @@ -26,12 +26,12 @@ namespace frontend { class ControlThesaurus; -class QThesaurus; +class GuiThesaurus; -class QThesaurusDialog : public QDialog, public Ui::QThesaurusUi { +class GuiThesaurusDialog : public QDialog, public Ui::ThesaurusUi { Q_OBJECT public: - QThesaurusDialog(QThesaurus * form); + GuiThesaurusDialog(GuiThesaurus * form); void updateLists(); protected Q_SLOTS: @@ -44,19 +44,19 @@ protected Q_SLOTS: protected: virtual void closeEvent(QCloseEvent * e); private: - QThesaurus * form_; + GuiThesaurus * form_; }; /// -class QThesaurus - : public QController > +class GuiThesaurus + : public QController > { public: /// - friend class QThesaurusDialog; + friend class GuiThesaurusDialog; /// - QThesaurus(Dialog &); + GuiThesaurus(Dialog &); private: /// Apply changes virtual void apply() {} diff --git a/src/frontends/qt4/QToc.cpp b/src/frontends/qt4/GuiToc.cpp similarity index 74% rename from src/frontends/qt4/QToc.cpp rename to src/frontends/qt4/GuiToc.cpp index b02b382d9e..7ec2110c1f 100644 --- a/src/frontends/qt4/QToc.cpp +++ b/src/frontends/qt4/GuiToc.cpp @@ -1,5 +1,5 @@ /** - * \file QToc.cpp + * \file GuiToc.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,7 +11,7 @@ #include -#include "QToc.h" +#include "GuiToc.h" #include "TocModel.h" #include "Qt2BC.h" @@ -33,13 +33,13 @@ namespace lyx { namespace frontend { -QToc::QToc(Dialog & dialog, QObject * parent) +GuiToc::GuiToc(Dialog & dialog, QObject * parent) : QObject(parent), ControlToc(dialog) { } -bool QToc::canOutline(int type) const +bool GuiToc::canOutline(int type) const { if (type < 0) return false; @@ -48,7 +48,7 @@ bool QToc::canOutline(int type) const } -int QToc::getTocDepth(int type) +int GuiToc::getTocDepth(int type) { if (type < 0) return 0; @@ -56,18 +56,18 @@ int QToc::getTocDepth(int type) } -QStandardItemModel * QToc::tocModel(int type) +QStandardItemModel * GuiToc::tocModel(int type) { if (type < 0) return 0; if (toc_models_.empty()) { - LYXERR(Debug::GUI) << "QToc::tocModel(): no types available " << endl; + LYXERR(Debug::GUI) << "GuiToc::tocModel(): no types available " << endl; return 0; } LYXERR(Debug::GUI) - << "QToc: type " << type + << "GuiToc: type " << type << " toc_models_.size() " << toc_models_.size() << endl; @@ -76,7 +76,7 @@ QStandardItemModel * QToc::tocModel(int type) } -QModelIndex const QToc::getCurrentIndex(int type) const +QModelIndex const GuiToc::getCurrentIndex(int type) const { if (type < 0) return QModelIndex(); @@ -91,12 +91,12 @@ QModelIndex const QToc::getCurrentIndex(int type) const } -void QToc::goTo(int type, QModelIndex const & index) +void GuiToc::goTo(int type, QModelIndex const & index) { if (type < 0 || !index.isValid() || index.model() != toc_models_[type]) { LYXERR(Debug::GUI) - << "QToc::goTo(): QModelIndex is invalid!" + << "GuiToc::goTo(): QModelIndex is invalid!" << endl; return; } @@ -105,13 +105,13 @@ void QToc::goTo(int type, QModelIndex const & index) TocIterator const it = toc_models_[type]->tocIterator(index); - LYXERR(Debug::GUI) << "QToc::goTo " << to_utf8(it->str()) << endl; + LYXERR(Debug::GUI) << "GuiToc::goTo " << to_utf8(it->str()) << endl; ControlToc::goTo(*it); } -bool QToc::initialiseParams(std::string const & data) +bool GuiToc::initialiseParams(std::string const & data) { if (!ControlToc::initialiseParams(data)) return false; @@ -121,7 +121,7 @@ bool QToc::initialiseParams(std::string const & data) } -void QToc::update() +void GuiToc::update() { toc_models_.clear(); TocList::const_iterator it = tocs().begin(); @@ -134,4 +134,4 @@ void QToc::update() } // namespace frontend } // namespace lyx -#include "QToc_moc.cpp" +#include "GuiToc_moc.cpp" diff --git a/src/frontends/qt4/QToc.h b/src/frontends/qt4/GuiToc.h similarity index 89% rename from src/frontends/qt4/QToc.h rename to src/frontends/qt4/GuiToc.h index a0403aa517..60d2cb5a64 100644 --- a/src/frontends/qt4/QToc.h +++ b/src/frontends/qt4/GuiToc.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QToc.h + * \file GuiToc.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -26,13 +26,13 @@ namespace frontend { class ControlToc; class TocModel; -class QToc : public QObject, public ControlToc +class GuiToc : public QObject, public ControlToc { Q_OBJECT public: - QToc(Dialog &, QObject * parent = 0); - virtual ~QToc() {} + GuiToc(Dialog &, QObject * parent = 0); + virtual ~GuiToc() {} /// \c ControlToc inherited method. virtual bool initialiseParams(std::string const & data); diff --git a/src/frontends/qt4/QLToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp similarity index 91% rename from src/frontends/qt4/QLToolbar.cpp rename to src/frontends/qt4/GuiToolbar.cpp index 2a0ee687dc..c51a6976fb 100644 --- a/src/frontends/qt4/QLToolbar.cpp +++ b/src/frontends/qt4/GuiToolbar.cpp @@ -1,5 +1,5 @@ /** - * \file qt4/QLToolbar.cpp + * \file qt4/GuiToolbar.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -24,8 +24,8 @@ #include "IconPalette.h" #include "GuiView.h" -#include "QCommandBuffer.h" -#include "QLToolbar.h" +#include "GuiCommandBuffer.h" +#include "GuiToolbar.h" #include "LyXAction.h" #include "Action.h" #include "qt_helpers.h" @@ -57,7 +57,7 @@ static TextClass const & textClass(LyXView const & lv) } -QLayoutBox::QLayoutBox(QToolBar * toolbar, GuiView & owner) +GuiLayoutBox::GuiLayoutBox(QToolBar * toolbar, GuiViewBase & owner) : owner_(owner) { combo_ = new QComboBox; @@ -73,7 +73,7 @@ QLayoutBox::QLayoutBox(QToolBar * toolbar, GuiView & owner) } -void QLayoutBox::set(docstring const & layout) +void GuiLayoutBox::set(docstring const & layout) { TextClass const & tc = textClass(owner_); @@ -95,7 +95,7 @@ void QLayoutBox::set(docstring const & layout) } -void QLayoutBox::update() +void GuiLayoutBox::update() { TextClass const & tc = textClass(owner_); @@ -121,19 +121,19 @@ void QLayoutBox::update() } -void QLayoutBox::clear() +void GuiLayoutBox::clear() { combo_->clear(); } -void QLayoutBox::open() +void GuiLayoutBox::open() { combo_->showPopup(); } -void QLayoutBox::setEnabled(bool enable) +void GuiLayoutBox::setEnabled(bool enable) { // Workaround for Qt bug where setEnabled(true) closes // the popup @@ -142,7 +142,7 @@ void QLayoutBox::setEnabled(bool enable) } -void QLayoutBox::selected(const QString & str) +void GuiLayoutBox::selected(const QString & str) { owner_.setFocus(); @@ -150,7 +150,7 @@ void QLayoutBox::selected(const QString & str) } -QLToolbar::QLToolbar(ToolbarInfo const & tbinfo, GuiView & owner) +GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiViewBase & owner) : QToolBar(qt_(tbinfo.gui_name), &owner), command_buffer_(0), owner_(owner) { // give visual separation between adjacent toolbars @@ -166,24 +166,24 @@ QLToolbar::QLToolbar(ToolbarInfo const & tbinfo, GuiView & owner) } -void QLToolbar::focusCommandBuffer() +void GuiToolbar::focusCommandBuffer() { if (command_buffer_) command_buffer_->setFocus(); } -void QLToolbar::add(ToolbarItem const & item) +void GuiToolbar::add(ToolbarItem const & item) { switch (item.type_) { case ToolbarItem::SEPARATOR: addSeparator(); break; case ToolbarItem::LAYOUTS: - layout_.reset(new QLayoutBox(this, owner_)); + layout_.reset(new GuiLayoutBox(this, owner_)); break; case ToolbarItem::MINIBUFFER: - command_buffer_ = new QCommandBuffer(&owner_); + command_buffer_ = new GuiCommandBuffer(&owner_); addWidget(command_buffer_); /// \todo find a Qt4 equivalent to setHorizontalStretchable(true); //setHorizontalStretchable(true); @@ -293,29 +293,29 @@ void QLToolbar::add(ToolbarItem const & item) } -void QLToolbar::hide(bool) +void GuiToolbar::hide(bool) { QToolBar::hide(); } -void QLToolbar::show(bool) +void GuiToolbar::show(bool) { QToolBar::show(); } -bool QLToolbar::isVisible() const +bool GuiToolbar::isVisible() const { return QToolBar::isVisible(); } -void QLToolbar::saveInfo(ToolbarSection::ToolbarInfo & tbinfo) +void GuiToolbar::saveInfo(ToolbarSection::ToolbarInfo & tbinfo) { // if tbinfo.state == auto *do not* set on/off if (tbinfo.state != ToolbarSection::ToolbarInfo::AUTO) { - if (QLToolbar::isVisible()) + if (GuiToolbar::isVisible()) tbinfo.state = ToolbarSection::ToolbarInfo::ON; else tbinfo.state = ToolbarSection::ToolbarInfo::OFF; @@ -342,7 +342,7 @@ void QLToolbar::saveInfo(ToolbarSection::ToolbarInfo & tbinfo) } -void QLToolbar::update() +void GuiToolbar::update() { // This is a speed bottleneck because this is called on every keypress // and update calls getStatus, which copies the cursor at least two times @@ -403,4 +403,4 @@ string const getIcon(FuncRequest const & f, bool unknown) } // namespace frontend } // namespace lyx -#include "QLToolbar_moc.cpp" +#include "GuiToolbar_moc.cpp" diff --git a/src/frontends/qt4/QLToolbar.h b/src/frontends/qt4/GuiToolbar.h similarity index 77% rename from src/frontends/qt4/QLToolbar.h rename to src/frontends/qt4/GuiToolbar.h index f2f97ce741..43fc238abb 100644 --- a/src/frontends/qt4/QLToolbar.h +++ b/src/frontends/qt4/GuiToolbar.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QLToolbar.h + * \file GuiToolbar.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -28,19 +28,21 @@ class QComboBox; namespace lyx { + class FuncRequest; + namespace frontend { -class QCommandBuffer; -class QLayoutBox; -class GuiView; +class GuiCommandBuffer; +class GuiLayoutBox; +class GuiViewBase; class Action; -class QLayoutBox : public QObject, public LayoutBox { +class GuiLayoutBox : public QObject, public LayoutBox { Q_OBJECT public: - QLayoutBox(QToolBar *, GuiView &); + GuiLayoutBox(QToolBar *, GuiViewBase &); /// select the right layout in the combox. void set(docstring const & layout); @@ -58,16 +60,16 @@ private Q_SLOTS: private: QComboBox * combo_; - GuiView & owner_; + GuiViewBase & owner_; }; -class QLToolbar : public QToolBar, public Toolbar { +class GuiToolbar : public QToolBar, public Toolbar { Q_OBJECT public: - QLToolbar(ToolbarInfo const &, GuiView &); + GuiToolbar(ToolbarInfo const &, GuiViewBase &); - //~QLToolbar(); + //~GuiToolbar(); void add(ToolbarItem const & item); void hide(bool); @@ -83,12 +85,12 @@ Q_SIGNALS: void updated(); private: - QCommandBuffer * command_buffer_; + GuiCommandBuffer * command_buffer_; std::vector ActionVector; - GuiView & owner_; + GuiViewBase & owner_; - boost::scoped_ptr layout_; + boost::scoped_ptr layout_; }; /// return a full path of an XPM for the given action diff --git a/src/frontends/qt4/QURLDialog.cpp b/src/frontends/qt4/GuiURLDialog.cpp similarity index 81% rename from src/frontends/qt4/QURLDialog.cpp rename to src/frontends/qt4/GuiURLDialog.cpp index e0ac0397f7..ceb273f1f4 100644 --- a/src/frontends/qt4/QURLDialog.cpp +++ b/src/frontends/qt4/GuiURLDialog.cpp @@ -1,5 +1,5 @@ /** - * \file QURLDialog.cpp + * \file GuiURLDialog.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QURLDialog.h" +#include "GuiURLDialog.h" #include "UrlView.h" #include @@ -20,7 +20,7 @@ namespace lyx { namespace frontend { -QURLDialog::QURLDialog(UrlView * form) +GuiURLDialog::GuiURLDialog(UrlView * form) : form_(form) { setupUi(this); @@ -38,13 +38,13 @@ QURLDialog::QURLDialog(UrlView * form) } -void QURLDialog::changed_adaptor() +void GuiURLDialog::changed_adaptor() { form_->changed(); } -void QURLDialog::closeEvent(QCloseEvent * e) +void GuiURLDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); @@ -53,4 +53,4 @@ void QURLDialog::closeEvent(QCloseEvent * e) } // namespace frontend } // namespace lyx -#include "QURLDialog_moc.cpp" +#include "GuiURLDialog_moc.cpp" diff --git a/src/frontends/qt4/QURLDialog.h b/src/frontends/qt4/GuiURLDialog.h similarity index 74% rename from src/frontends/qt4/QURLDialog.h rename to src/frontends/qt4/GuiURLDialog.h index d0dc552826..84c7cf33d0 100644 --- a/src/frontends/qt4/QURLDialog.h +++ b/src/frontends/qt4/GuiURLDialog.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QURLDialog.h + * \file GuiURLDialog.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 QURLDIALOG_H -#define QURLDIALOG_H +#ifndef GUIURLDIALOG_H +#define GUIURLDIALOG_H #include "ui_URLUi.h" @@ -22,10 +22,10 @@ namespace frontend { class UrlView; -class QURLDialog : public QDialog, public Ui::QURLUi { +class GuiURLDialog : public QDialog, public Ui::URLUi { Q_OBJECT public: - QURLDialog(UrlView * form); + GuiURLDialog(UrlView * form); public Q_SLOTS: void changed_adaptor(); protected: @@ -37,4 +37,4 @@ private: } // namespace frontend } // namespace lyx -#endif // QURLDIALOG_H +#endif // GUIURLDIALOG_H diff --git a/src/frontends/qt4/QVSpace.cpp b/src/frontends/qt4/GuiVSpace.cpp similarity index 89% rename from src/frontends/qt4/QVSpace.cpp rename to src/frontends/qt4/GuiVSpace.cpp index 3d3bd68524..7901590c0b 100644 --- a/src/frontends/qt4/QVSpace.cpp +++ b/src/frontends/qt4/GuiVSpace.cpp @@ -1,5 +1,5 @@ /** - * \file QVSpace.cpp + * \file GuiVSpace.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -15,7 +15,7 @@ #include -#include "QVSpace.h" +#include "GuiVSpace.h" #include "Qt2BC.h" #include "CheckedLineEdit.h" @@ -47,12 +47,12 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QVSpaceDialog +// GuiVSpaceDialog // ///////////////////////////////////////////////////////////////////// -QVSpaceDialog::QVSpaceDialog(QVSpace * form) +GuiVSpaceDialog::GuiVSpaceDialog(GuiVSpace * form) : form_(form) { setupUi(this); @@ -76,20 +76,20 @@ QVSpaceDialog::QVSpaceDialog(QVSpace * form) } -void QVSpaceDialog::closeEvent(QCloseEvent * e) +void GuiVSpaceDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QVSpaceDialog::change_adaptor() +void GuiVSpaceDialog::change_adaptor() { form_->changed(); } -void QVSpaceDialog::enableCustom(int selection) +void GuiVSpaceDialog::enableCustom(int selection) { bool const enable = selection == 5; valueLE->setEnabled(enable); @@ -99,7 +99,7 @@ void QVSpaceDialog::enableCustom(int selection) ///////////////////////////////////////////////////////////////////// // -// QVSpace +// GuiVSpace // ///////////////////////////////////////////////////////////////////// @@ -182,17 +182,17 @@ static VSpace setVSpaceFromWidgets(int spacing, } -typedef QController > VSpaceBase; +typedef QController > VSpaceBase; -QVSpace::QVSpace(Dialog & parent) +GuiVSpace::GuiVSpace(Dialog & parent) : VSpaceBase(parent, _("Vertical Space Settings")) {} -void QVSpace::build_dialog() +void GuiVSpace::build_dialog() { // the tabbed folder - dialog_.reset(new QVSpaceDialog(this)); + dialog_.reset(new GuiVSpaceDialog(this)); // Manage the ok, apply, restore and cancel/close buttons bcview().setOK(dialog_->okPB); @@ -213,7 +213,7 @@ void QVSpace::build_dialog() } -void QVSpace::apply() +void GuiVSpace::apply() { // spacing // If a vspace choice is "Length" but there's no text in @@ -232,7 +232,7 @@ void QVSpace::apply() } -void QVSpace::update_contents() +void GuiVSpace::update_contents() { setWidgetsFromVSpace(controller().params(), dialog_->spacingCO, @@ -245,4 +245,4 @@ void QVSpace::update_contents() } // namespace lyx -#include "QVSpace_moc.cpp" +#include "GuiVSpace_moc.cpp" diff --git a/src/frontends/qt4/QVSpace.h b/src/frontends/qt4/GuiVSpace.h similarity index 72% rename from src/frontends/qt4/QVSpace.h rename to src/frontends/qt4/GuiVSpace.h index b8c4c26e90..755758a1df 100644 --- a/src/frontends/qt4/QVSpace.h +++ b/src/frontends/qt4/GuiVSpace.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QVSpace.h + * \file GuiVSpace.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #ifndef QVSPACE_H #define QVSPACE_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_VSpaceUi.h" @@ -27,14 +27,14 @@ namespace frontend { class ControlVSpace; -class QVSpace; +class GuiVSpace; -class QVSpaceDialog : public QDialog, public Ui::QVSpaceUi { +class GuiVSpaceDialog : public QDialog, public Ui::VSpaceUi { Q_OBJECT public: - QVSpaceDialog(QVSpace * form); + GuiVSpaceDialog(GuiVSpace * form); public Q_SLOTS: void change_adaptor(); @@ -44,19 +44,19 @@ protected Q_SLOTS: void enableCustom(int); private: - QVSpace * form_; + GuiVSpace * form_; }; -class QVSpace - : public QController > +class GuiVSpace + : public QController > { public: /// - friend class QVSpaceDialog; + friend class GuiVSpaceDialog; /// - QVSpace(Dialog &); + GuiVSpace(Dialog &); private: /// Build the dialog virtual void build_dialog(); diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 32e2117a72..9562a84bc0 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -17,9 +17,9 @@ #include "GuiImplementation.h" #include "GuiWorkArea.h" -#include "QKeySymbol.h" -#include "QLMenubar.h" -#include "QLToolbar.h" +#include "GuiKeySymbol.h" +#include "GuiMenubar.h" +#include "GuiToolbar.h" #include "qt_helpers.h" #include "frontends/Application.h" @@ -83,7 +83,7 @@ namespace { int const statusbar_timer_value = 3000; -class BackgroundWidget: public QWidget +class BackgroundWidget : public QWidget { public: BackgroundWidget(QString const & file, QString const & text) @@ -105,7 +105,7 @@ public: pain.drawText(260, 270, text); } - void paintEvent(QPaintEvent * ev) + void paintEvent(QPaintEvent *) { if (!splash_) return; @@ -121,7 +121,7 @@ private: }; -class TabWidget: public QTabWidget { +class TabWidget : public QTabWidget { public: void showBar(bool show) { tabBar()->setVisible(show); } }; @@ -130,7 +130,7 @@ public: } // namespace anon -struct GuiView::GuiViewPrivate +struct GuiViewBase::GuiViewPrivate { string cur_title; @@ -141,10 +141,9 @@ struct GuiView::GuiViewPrivate QStackedWidget * stack_widget_; BackgroundWidget * bg_widget_; /// view's menubar - QLMenubar * menubar_; + GuiMenubar * menubar_; - GuiViewPrivate() : posx_offset(0), posy_offset(0) - {} + GuiViewPrivate() : posx_offset(0), posy_offset(0) {} unsigned int smallIconSize; unsigned int normalIconSize; @@ -152,25 +151,25 @@ struct GuiView::GuiViewPrivate // static needed by "New Window" static unsigned int lastIconSize; - QMenu* toolBarPopup(GuiView *parent) + QMenu * toolBarPopup(GuiViewBase * parent) { // FIXME: translation - QMenu* menu = new QMenu(parent); - QActionGroup *iconSizeGroup = new QActionGroup(parent); + QMenu * menu = new QMenu(parent); + QActionGroup * iconSizeGroup = new QActionGroup(parent); - QAction *smallIcons = new QAction(iconSizeGroup); + QAction * smallIcons = new QAction(iconSizeGroup); smallIcons->setText(qt_("Small-sized icons")); smallIcons->setCheckable(true); QObject::connect(smallIcons, SIGNAL(triggered()), parent, SLOT(smallSizedIcons())); menu->addAction(smallIcons); - QAction *normalIcons = new QAction(iconSizeGroup); + QAction * normalIcons = new QAction(iconSizeGroup); normalIcons->setText(qt_("Normal-sized icons")); normalIcons->setCheckable(true); QObject::connect(normalIcons, SIGNAL(triggered()), parent, SLOT(normalSizedIcons())); menu->addAction(normalIcons); - QAction *bigIcons = new QAction(iconSizeGroup); + QAction * bigIcons = new QAction(iconSizeGroup); bigIcons->setText(qt_("Big-sized icons")); bigIcons->setCheckable(true); QObject::connect(bigIcons, SIGNAL(triggered()), parent, SLOT(bigSizedIcons())); @@ -211,10 +210,10 @@ struct GuiView::GuiViewPrivate }; -unsigned int GuiView::GuiViewPrivate::lastIconSize = 0; +unsigned int GuiViewBase::GuiViewPrivate::lastIconSize = 0; -GuiView::GuiView(int id) +GuiViewBase::GuiViewBase(int id) : QMainWindow(), LyXView(id), quitting_by_menu_(false), d(*new GuiViewPrivate) { @@ -278,14 +277,14 @@ GuiView::GuiView(int id) } -GuiView::~GuiView() +GuiViewBase::~GuiViewBase() { delete d.menubar_; delete &d; } -void GuiView::close() +void GuiViewBase::close() { quitting_by_menu_ = true; QMainWindow::close(); @@ -293,22 +292,22 @@ void GuiView::close() } -void GuiView::setFocus() +void GuiViewBase::setFocus() { if (d.tab_widget_->count()) d.tab_widget_->currentWidget()->setFocus(); } -QMenu* GuiView::createPopupMenu() +QMenu* GuiViewBase::createPopupMenu() { return d.toolBarPopup(this); } -void GuiView::init() +void GuiViewBase::init() { - d.menubar_ = new QLMenubar(this, menubackend); + d.menubar_ = new GuiMenubar(this, menubackend); toolbars_->init(); @@ -322,7 +321,7 @@ void GuiView::init() } -void GuiView::closeEvent(QCloseEvent * close_event) +void GuiViewBase::closeEvent(QCloseEvent * close_event) { // we may have been called through the close window button // which bypasses the LFUN machinery. @@ -357,7 +356,7 @@ void GuiView::closeEvent(QCloseEvent * close_event) } -void GuiView::dragEnterEvent(QDragEnterEvent * event) +void GuiViewBase::dragEnterEvent(QDragEnterEvent * event) { if (event->mimeData()->hasUrls()) event->accept(); @@ -367,7 +366,7 @@ void GuiView::dragEnterEvent(QDragEnterEvent * event) } -void GuiView::dropEvent(QDropEvent* event) +void GuiViewBase::dropEvent(QDropEvent* event) { QList files = event->mimeData()->urls(); if (files.isEmpty()) @@ -375,7 +374,7 @@ void GuiView::dropEvent(QDropEvent* event) LYXERR(Debug::GUI) << BOOST_CURRENT_FUNCTION << " got URLs!" << endl; - for (int i = 0; i!=files.size(); ++i) { + for (int i = 0; i != files.size(); ++i) { string const file = support::os::internal_path(fromqstr( files.at(i).toLocalFile())); if (!file.empty()) @@ -384,7 +383,7 @@ void GuiView::dropEvent(QDropEvent* event) } -void GuiView::saveGeometry() +void GuiViewBase::saveGeometry() { static bool done = false; if (done) @@ -398,7 +397,7 @@ void GuiView::saveGeometry() // http://www.trolltech.com/developer/task-tracker/index_html?id=119684+&method=entry // Then also the moveEvent, resizeEvent, and the // code for floatingGeometry_ can be removed; - // adjust GuiView::setGeometry() + // adjust GuiViewBase::setGeometry() QRect normal_geometry; int maximized; @@ -449,7 +448,7 @@ void GuiView::saveGeometry() } -void GuiView::setGeometry(unsigned int width, +void GuiViewBase::setGeometry(unsigned int width, unsigned int height, int posx, int posy, int maximized, @@ -559,7 +558,7 @@ void GuiView::setGeometry(unsigned int width, } -void GuiView::setWindowTitle(docstring const & t, docstring const & it) +void GuiViewBase::setWindowTitle(docstring const & t, docstring const & it) { QString title = windowTitle(); QString new_title = toqstr(t); @@ -570,7 +569,7 @@ void GuiView::setWindowTitle(docstring const & t, docstring const & it) } -void GuiView::message(docstring const & str) +void GuiViewBase::message(docstring const & str) { statusBar()->showMessage(toqstr(str)); statusbar_timer_.stop(); @@ -578,38 +577,38 @@ void GuiView::message(docstring const & str) } -void GuiView::clearMessage() +void GuiViewBase::clearMessage() { update_view_state_qt(); } -void GuiView::setIconSize(unsigned int size) +void GuiViewBase::setIconSize(unsigned int size) { d.lastIconSize = size; QMainWindow::setIconSize(QSize(size, size)); } -void GuiView::smallSizedIcons() +void GuiViewBase::smallSizedIcons() { setIconSize(d.smallIconSize); } -void GuiView::normalSizedIcons() +void GuiViewBase::normalSizedIcons() { setIconSize(d.normalIconSize); } -void GuiView::bigSizedIcons() +void GuiViewBase::bigSizedIcons() { setIconSize(d.bigIconSize); } -void GuiView::update_view_state_qt() +void GuiViewBase::update_view_state_qt() { if (!hasFocus()) return; @@ -619,13 +618,13 @@ void GuiView::update_view_state_qt() } -void GuiView::closeCurrentTab() +void GuiViewBase::closeCurrentTab() { dispatch(FuncRequest(LFUN_BUFFER_CLOSE)); } -void GuiView::currentTabChanged(int i) +void GuiViewBase::currentTabChanged(int i) { disconnectBuffer(); disconnectBufferView(); @@ -655,7 +654,7 @@ void GuiView::currentTabChanged(int i) } -void GuiView::updateStatusBar() +void GuiViewBase::updateStatusBar() { // let the user see the explicit message if (statusbar_timer_.isActive()) @@ -665,19 +664,19 @@ void GuiView::updateStatusBar() } -void GuiView::activated(FuncRequest const & func) +void GuiViewBase::activated(FuncRequest const & func) { dispatch(func); } -bool GuiView::hasFocus() const +bool GuiViewBase::hasFocus() const { return qApp->activeWindow() == this; } -QRect GuiView::updateFloatingGeometry() +QRect GuiViewBase::updateFloatingGeometry() { QDesktopWidget& dw = *qApp->desktop(); QRect desk = dw.availableGeometry(dw.primaryScreen()); @@ -689,19 +688,19 @@ QRect GuiView::updateFloatingGeometry() } -void GuiView::resizeEvent(QResizeEvent *) +void GuiViewBase::resizeEvent(QResizeEvent *) { updateFloatingGeometry(); } -void GuiView::moveEvent(QMoveEvent *) +void GuiViewBase::moveEvent(QMoveEvent *) { updateFloatingGeometry(); } -bool GuiView::event(QEvent * e) +bool GuiViewBase::event(QEvent * e) { switch (e->type()) { @@ -725,14 +724,14 @@ bool GuiView::event(QEvent * e) QKeyEvent * ke = static_cast(e); if (d.tab_widget_->count() == 0) { theLyXFunc().setLyXView(this); - boost::shared_ptr sym(new QKeySymbol); + boost::shared_ptr sym(new GuiKeySymbol); sym->set(ke); theLyXFunc().processKeySym(sym, q_key_state(ke->modifiers())); e->accept(); return true; } if (ke->key() == Qt::Key_Tab || ke->key() == Qt::Key_Backtab) { - boost::shared_ptr sym(new QKeySymbol); + boost::shared_ptr sym(new GuiKeySymbol); sym->set(ke); currentWorkArea()->processKeySym(sym, key_modifier::none); e->accept(); @@ -745,14 +744,14 @@ bool GuiView::event(QEvent * e) } -bool GuiView::focusNextPrevChild(bool /*next*/) +bool GuiViewBase::focusNextPrevChild(bool /*next*/) { setFocus(); return true; } -void GuiView::show() +void GuiViewBase::show() { QMainWindow::setWindowTitle(qt_("LyX")); QMainWindow::show(); @@ -760,7 +759,7 @@ void GuiView::show() } -void GuiView::busy(bool yes) +void GuiViewBase::busy(bool yes) { if (d.tab_widget_->count()) { GuiWorkArea * wa = dynamic_cast(d.tab_widget_->currentWidget()); @@ -779,14 +778,14 @@ void GuiView::busy(bool yes) } -Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarInfo const & tbinfo, bool newline) +Toolbars::ToolbarPtr GuiViewBase::makeToolbar(ToolbarInfo const & tbinfo, bool newline) { - QLToolbar * Tb = new QLToolbar(tbinfo, *this); + GuiToolbar * toolBar = new GuiToolbar(tbinfo, *this); if (tbinfo.flags & ToolbarInfo::TOP) { if (newline) addToolBarBreak(Qt::TopToolBarArea); - addToolBar(Qt::TopToolBarArea, Tb); + addToolBar(Qt::TopToolBarArea, toolBar); } if (tbinfo.flags & ToolbarInfo::BOTTOM) { @@ -795,7 +794,7 @@ Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarInfo const & tbinfo, bool newli if (newline) addToolBarBreak(Qt::BottomToolBarArea); #endif - addToolBar(Qt::BottomToolBarArea, Tb); + addToolBar(Qt::BottomToolBarArea, toolBar); } if (tbinfo.flags & ToolbarInfo::LEFT) { @@ -804,7 +803,7 @@ Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarInfo const & tbinfo, bool newli if (newline) addToolBarBreak(Qt::LeftToolBarArea); #endif - addToolBar(Qt::LeftToolBarArea, Tb); + addToolBar(Qt::LeftToolBarArea, toolBar); } if (tbinfo.flags & ToolbarInfo::RIGHT) { @@ -813,20 +812,20 @@ Toolbars::ToolbarPtr GuiView::makeToolbar(ToolbarInfo const & tbinfo, bool newli if (newline) addToolBarBreak(Qt::RightToolBarArea); #endif - addToolBar(Qt::RightToolBarArea, Tb); + addToolBar(Qt::RightToolBarArea, toolBar); } // The following does not work so I cannot restore to exact toolbar location /* ToolbarSection::ToolbarInfo & tbinfo = LyX::ref().session().toolbars().load(tbinfo.name); - Tb->move(tbinfo.posx, tbinfo.posy); + toolBar->move(tbinfo.posx, tbinfo.posy); */ - return Toolbars::ToolbarPtr(Tb); + return Toolbars::ToolbarPtr(toolBar); } -WorkArea * GuiView::workArea(Buffer & buffer) +WorkArea * GuiViewBase::workArea(Buffer & buffer) { for (int i = 0; i != d.tab_widget_->count(); ++i) { GuiWorkArea * wa = dynamic_cast(d.tab_widget_->widget(i)); @@ -838,7 +837,7 @@ WorkArea * GuiView::workArea(Buffer & buffer) } -WorkArea * GuiView::addWorkArea(Buffer & buffer) +WorkArea * GuiViewBase::addWorkArea(Buffer & buffer) { GuiWorkArea * wa = new GuiWorkArea(buffer, *this); wa->setUpdatesEnabled(false); @@ -852,7 +851,7 @@ WorkArea * GuiView::addWorkArea(Buffer & buffer) } -WorkArea * GuiView::currentWorkArea() +WorkArea * GuiViewBase::currentWorkArea() { if (d.tab_widget_->count() == 0) return 0; @@ -861,7 +860,7 @@ WorkArea * GuiView::currentWorkArea() } -WorkArea const * GuiView::currentWorkArea() const +WorkArea const * GuiViewBase::currentWorkArea() const { if (d.tab_widget_->count() == 0) return 0; @@ -870,7 +869,7 @@ WorkArea const * GuiView::currentWorkArea() const } -void GuiView::setCurrentWorkArea(WorkArea * work_area) +void GuiViewBase::setCurrentWorkArea(WorkArea * work_area) { BOOST_ASSERT(work_area); @@ -890,7 +889,7 @@ void GuiView::setCurrentWorkArea(WorkArea * work_area) } -void GuiView::removeWorkArea(WorkArea * work_area) +void GuiViewBase::removeWorkArea(WorkArea * work_area) { BOOST_ASSERT(work_area); if (work_area == currentWorkArea()) { @@ -926,7 +925,7 @@ void GuiView::removeWorkArea(WorkArea * work_area) } -void GuiView::showMiniBuffer(bool visible) +void GuiViewBase::showMiniBuffer(bool visible) { Toolbar * t = toolbars_->display("minibuffer", visible); if (t) @@ -934,7 +933,7 @@ void GuiView::showMiniBuffer(bool visible) } -void GuiView::openMenu(docstring const & name) +void GuiViewBase::openMenu(docstring const & name) { d.menubar_->openByName(name); } diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index 3f221e2b24..17836a57ed 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -39,17 +39,17 @@ QWidget* mainWindow(); * * qt4-private implementation of the main LyX window. * - * Note: any QObject emits a destroyed(QObject *) Qt signal when it - * is deleted.This might be useful for closing other dialogs - * depending on a given GuiView. + * Note: a QObject emits a destroyed(QObject *) Qt signal when it + * is deleted. This might be useful for closing other dialogs + * depending on a given GuiView. */ -class GuiView : public QMainWindow, public LyXView { +class GuiViewBase : public QMainWindow, public LyXView { Q_OBJECT public: /// create a main window of the given dimensions - GuiView(int id); + GuiViewBase(int id); - ~GuiView(); + ~GuiViewBase(); virtual void init(); virtual void close(); diff --git a/src/frontends/qt4/QViewSource.cpp b/src/frontends/qt4/GuiViewSource.cpp similarity index 93% rename from src/frontends/qt4/QViewSource.cpp rename to src/frontends/qt4/GuiViewSource.cpp index 8d505d0f43..e22b0652d1 100644 --- a/src/frontends/qt4/QViewSource.cpp +++ b/src/frontends/qt4/GuiViewSource.cpp @@ -1,5 +1,5 @@ /** - * \file QViewSource.cpp + * \file GuiViewSource.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #include -#include "QViewSource.h" +#include "GuiViewSource.h" #include "qt_helpers.h" #include @@ -25,11 +25,11 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QViewSourceDialog +// GuiViewSourceDialog // ///////////////////////////////////////////////////////////////////// -QViewSourceDialog::QViewSourceDialog(QViewSource * form) +GuiViewSourceDialog::GuiViewSourceDialog(GuiViewSource * form) : form_(form) { setupUi(this); @@ -59,7 +59,7 @@ QViewSourceDialog::QViewSourceDialog(QViewSource * form) } -void QViewSourceDialog::update() +void GuiViewSourceDialog::update() { if (autoUpdateCB->isChecked()) form_->update(viewFullSourceCB->isChecked()); @@ -160,7 +160,7 @@ void LaTeXHighlighter::highlightBlock(QString const & text) } -QViewSource::QViewSource(Dialog & parent) +GuiViewSource::GuiViewSource(Dialog & parent) : ControlViewSource(parent) { document_ = new QTextDocument(this); @@ -170,11 +170,11 @@ QViewSource::QViewSource(Dialog & parent) ///////////////////////////////////////////////////////////////////// // -// QViewSource +// GuiViewSource // ///////////////////////////////////////////////////////////////////// -void QViewSource::update(bool full_source) +void GuiViewSource::update(bool full_source) { document_->setPlainText(toqstr(updateContent(full_source))); } @@ -183,4 +183,4 @@ void QViewSource::update(bool full_source) } // namespace frontend } // namespace lyx -#include "QViewSource_moc.cpp" +#include "GuiViewSource_moc.cpp" diff --git a/src/frontends/qt4/QViewSource.h b/src/frontends/qt4/GuiViewSource.h similarity index 81% rename from src/frontends/qt4/QViewSource.h rename to src/frontends/qt4/GuiViewSource.h index 06ca89aab6..10145f7e25 100644 --- a/src/frontends/qt4/QViewSource.h +++ b/src/frontends/qt4/GuiViewSource.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QViewSource.h + * \file GuiViewSource.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -44,27 +44,27 @@ private: -class QViewSource; +class GuiViewSource; -class QViewSourceDialog : public QWidget, public Ui::QViewSourceUi { +class GuiViewSourceDialog : public QWidget, public Ui::ViewSourceUi { Q_OBJECT public: - QViewSourceDialog(QViewSource * form); + GuiViewSourceDialog(GuiViewSource * form); public Q_SLOTS: // update content void update(); private: - QViewSource * form_; + GuiViewSource * form_; }; /// -class QViewSource : public QObject, public ControlViewSource { +class GuiViewSource : public QObject, public ControlViewSource { public: /// - QViewSource(Dialog &); + GuiViewSource(Dialog &); /// QTextDocument * document() { return document_; } /// diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp index bcacd16dd9..c91362a3dd 100644 --- a/src/frontends/qt4/GuiWorkArea.cpp +++ b/src/frontends/qt4/GuiWorkArea.cpp @@ -14,8 +14,8 @@ #include "GuiWorkArea.h" #include "GuiApplication.h" -#include "QLPainter.h" -#include "QKeySymbol.h" +#include "GuiPainter.h" +#include "GuiKeySymbol.h" #include "qt_helpers.h" #include "frontends/LyXView.h" @@ -418,15 +418,18 @@ void GuiWorkArea::keyPressEvent(QKeyEvent * e) << " key=" << e->key() << endl; - boost::shared_ptr sym(new QKeySymbol); + boost::shared_ptr sym(new GuiKeySymbol); sym->set(e); processKeySym(sym, q_key_state(e->modifiers())); } -void GuiWorkArea::doubleClickTimeout() { + +void GuiWorkArea::doubleClickTimeout() +{ dc_event_.active = false; } + void GuiWorkArea::mouseDoubleClickEvent(QMouseEvent * e) { dc_event_ = double_click(e); diff --git a/src/frontends/qt4/QWrap.cpp b/src/frontends/qt4/GuiWrap.cpp similarity index 86% rename from src/frontends/qt4/QWrap.cpp rename to src/frontends/qt4/GuiWrap.cpp index dca6f212f9..88a85a2507 100644 --- a/src/frontends/qt4/QWrap.cpp +++ b/src/frontends/qt4/GuiWrap.cpp @@ -1,5 +1,5 @@ /** - * \file QWrap.cpp + * \file GuiWrap.cpp * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "QWrap.h" +#include "GuiWrap.h" #include "Qt2BC.h" #include "LengthCombo.h" @@ -35,12 +35,12 @@ namespace frontend { ///////////////////////////////////////////////////////////////////// // -// QWrapDialog +// GuiWrapDialog // ///////////////////////////////////////////////////////////////////// -QWrapDialog::QWrapDialog(QWrap * form) +GuiWrapDialog::GuiWrapDialog(GuiWrap * form) : form_(form) { setupUi(this); @@ -59,35 +59,35 @@ QWrapDialog::QWrapDialog(QWrap * form) } -void QWrapDialog::closeEvent(QCloseEvent * e) +void GuiWrapDialog::closeEvent(QCloseEvent * e) { form_->slotWMHide(); e->accept(); } -void QWrapDialog::change_adaptor() +void GuiWrapDialog::change_adaptor() { form_->changed(); } ///////////////////////////////////////////////////////////////////// // -// QWrap +// GuiWrap // ///////////////////////////////////////////////////////////////////// -typedef QController > wrap_base_class; +typedef QController > wrap_base_class; -QWrap::QWrap(Dialog & parent) +GuiWrap::GuiWrap(Dialog & parent) : wrap_base_class(parent, _("Text Wrap Settings")) { } -void QWrap::build_dialog() +void GuiWrap::build_dialog() { - dialog_.reset(new QWrapDialog(this)); + dialog_.reset(new GuiWrapDialog(this)); bcview().setRestore(dialog_->restorePB); bcview().setOK(dialog_->okPB); @@ -100,7 +100,7 @@ void QWrap::build_dialog() } -void QWrap::apply() +void GuiWrap::apply() { double const value = convert(fromqstr(dialog_->widthED->text())); Length::UNIT unit = dialog_->unitsLC->currentLengthItem(); @@ -138,7 +138,7 @@ static string const numtostr(double val) } -void QWrap::update_contents() +void GuiWrap::update_contents() { InsetWrapParams & params = controller().params(); @@ -161,4 +161,4 @@ void QWrap::update_contents() } // namespace lyx -#include "QWrap_moc.cpp" +#include "GuiWrap_moc.cpp" diff --git a/src/frontends/qt4/QWrap.h b/src/frontends/qt4/GuiWrap.h similarity index 71% rename from src/frontends/qt4/QWrap.h rename to src/frontends/qt4/GuiWrap.h index fad58ddf9c..293b26e5bf 100644 --- a/src/frontends/qt4/QWrap.h +++ b/src/frontends/qt4/GuiWrap.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file QWrap.h + * \file GuiWrap.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef QWRAP_H #define QWRAP_H -#include "QDialogView.h" +#include "GuiDialogView.h" #include "ui_WrapUi.h" #include @@ -21,28 +21,28 @@ namespace lyx { namespace frontend { -class QWrap; +class GuiWrap; -class QWrapDialog : public QDialog, public Ui::QWrapUi { +class GuiWrapDialog : public QDialog, public Ui::WrapUi { Q_OBJECT public: - QWrapDialog(QWrap * form); + GuiWrapDialog(GuiWrap * form); protected Q_SLOTS: virtual void change_adaptor(); protected: virtual void closeEvent(QCloseEvent * e); private: - QWrap * form_; + GuiWrap * form_; }; class ControlWrap; -class QWrap : public QController > { +class GuiWrap : public QController > { public: - friend class QWrapDialog; + friend class GuiWrapDialog; - QWrap(Dialog &); + GuiWrap(Dialog &); private: /// Apply changes virtual void apply(); diff --git a/src/frontends/qt4/KeySymbol.cpp b/src/frontends/qt4/KeySymbol.cpp deleted file mode 100644 index b98b37a430..0000000000 --- a/src/frontends/qt4/KeySymbol.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/** - * \file qt4/KeySymbolFactory.cpp - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author Asger & Jürgen - * - * Full author contact details are available in file CREDITS. - */ - -#include - -#include "frontends/KeySymbol.h" - -#include "QKeySymbol.h" - -namespace lyx { - -KeySymbol * createKeySymbol() -{ - return new QKeySymbol; -} - -} // namespace lyx diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 7fb791eba9..f5256a3624 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -35,91 +35,91 @@ AM_CPPFLAGS += \ -I$(top_srcdir)/src/frontends/controllers SOURCEFILES = \ + Action.cpp \ alert_pimpl.cpp \ + BulletsModule.cpp \ CheckedLineEdit.cpp \ + ColorCache.cpp \ Dialogs.cpp \ + EmptyTable.cpp \ FileDialog.cpp \ + FloatPlacement.cpp \ + GuiAbout.cpp \ + GuiApplication.cpp \ + GuiBibitem.cpp \ + GuiBibtex.cpp \ + GuiBox.cpp \ + GuiBranch.cpp \ + GuiBranches.cpp \ + GuiChanges.cpp \ + GuiCharacter.cpp \ + GuiCitation.cpp \ + GuiCitationDialog.cpp \ GuiClipboard.cpp \ + GuiCommandBuffer.cpp \ + GuiCommandEdit.cpp \ + GuiDelimiterDialog.cpp \ + GuiDialogView.cpp \ + GuiDocument.cpp \ + GuiErrorList.cpp \ + GuiERT.cpp \ + GuiExternal.cpp \ + GuiFloat.cpp \ + GuiFloatDialog.cpp \ + GuiFontExample.cpp \ GuiFontLoader.cpp \ GuiFontMetrics.cpp \ - GuiSelection.cpp \ - KeySymbol.cpp \ - QCitation.cpp \ - QFloat.cpp \ - QFontExample.cpp \ - QLImage.cpp \ - QLPainter.cpp \ - QPrint.cpp \ - Qt2BC.cpp \ - qt_helpers.cpp \ - UrlView.cpp \ - Action.cpp \ - BulletsModule.cpp \ - ColorCache.cpp \ - EmptyTable.cpp \ - FloatPlacement.cpp \ - GuiApplication.cpp \ + GuiGraphics.cpp \ + GuiGraphicsDialog.cpp \ + GuiImage.cpp \ GuiImplementation.cpp \ + GuiInclude.cpp \ + GuiIndex.cpp \ + GuiKeySymbol.cpp \ + GuiKeySymbol.cpp \ + GuiListings.cpp \ + GuiLog.cpp \ + GuiMathMatrixDialog.cpp \ + GuiMenubar.cpp \ + GuiNomencl.cpp \ + GuiNote.cpp \ + GuiPainter.cpp \ + GuiParagraph.cpp \ + GuiPopupMenu.cpp \ + GuiPrefs.cpp \ + GuiPrint.cpp \ + GuiPrintDialog.cpp \ + GuiRef.cpp \ + GuiSearch.cpp \ + GuiSelection.cpp \ + GuiSelectionManager.cpp \ + GuiSendto.cpp \ + GuiSetBorder.cpp \ + GuiShowFile.cpp \ + GuiSpellchecker.cpp \ + GuiTabular.cpp \ + GuiTabularCreate.cpp \ + GuiTexinfo.cpp \ + GuiThesaurus.cpp \ + GuiToc.cpp \ + GuiToolbar.cpp \ + GuiURLDialog.cpp \ GuiView.cpp \ + GuiViewSource.cpp \ + GuiVSpace.cpp \ GuiWorkArea.cpp \ + GuiWrap.cpp \ IconPalette.cpp \ InsertTableWidget.cpp \ LengthCombo.cpp \ LyXFileDialog.cpp \ PanelStack.cpp \ - QAbout.cpp \ - QBibitem.cpp \ - QBibtex.cpp \ - QBox.cpp \ - QBranch.cpp \ - QBranches.cpp \ - QChanges.cpp \ - QCharacter.cpp \ - QCitationDialog.cpp \ - QCommandBuffer.cpp \ - QCommandEdit.cpp \ - QDelimiterDialog.cpp \ - QDialogView.cpp \ - QDocument.cpp \ - QErrorList.cpp \ - QERT.cpp \ - QExternal.cpp \ - QFloatDialog.cpp \ - QGraphics.cpp \ - QGraphicsDialog.cpp \ - QInclude.cpp \ - QIndex.cpp \ - QKeySymbol.cpp \ - QListings.cpp \ - QLMenubar.cpp \ - QLog.cpp \ - QLPopupMenu.cpp \ - QLPrintDialog.cpp \ - QLToolbar.cpp \ - QMathMatrixDialog.cpp \ - QNomencl.cpp \ - QNote.cpp \ - QParagraph.cpp \ - QPrefs.cpp \ - QRef.cpp \ - QSearch.cpp \ - QSelectionManager.cpp \ - QSendto.cpp \ - QSetBorder.cpp \ - QShowFile.cpp \ - QSpellchecker.cpp \ - QTabular.cpp \ - QTabularCreate.cpp \ - QTexinfo.cpp \ - QThesaurus.cpp \ - QToc.cpp \ - QURLDialog.cpp \ - QViewSource.cpp \ - QVSpace.cpp \ - QWrap.cpp \ + Qt2BC.cpp \ + qt_helpers.cpp \ socket_callback.cpp \ TocModel.cpp \ TocWidget.cpp \ + UrlView.cpp \ Validator.cpp NOMOCHEADER = \ @@ -128,10 +128,10 @@ NOMOCHEADER = \ GuiFontLoader.h \ GuiFontMetrics.h \ GuiSelection.h \ - QGraphics.h \ - QLImage.h \ - QLPainter.h \ - QPrint.h \ + GuiGraphics.h \ + GuiImage.h \ + GuiPainter.h \ + GuiPrint.h \ Qt2BC.h \ qt_helpers.h @@ -142,68 +142,68 @@ MOCHEADER = \ DockView.h \ EmptyTable.h \ FloatPlacement.h \ + GuiAbout.h \ GuiApplication.h \ + GuiBibitem.h \ + GuiBibtex.h \ + GuiBox.h \ + GuiBranches.h \ + GuiBranch.h \ + GuiChanges.h \ + GuiCharacter.h \ + GuiCitationDialog.h \ + GuiCitation.h \ + GuiCommandBuffer.h \ + GuiCommandEdit.h \ + GuiDelimiterDialog.h \ + GuiDialogView.h \ + GuiDocument.h \ + GuiErrorList.h \ + GuiERT.h \ + GuiExternal.h \ + GuiFloatDialog.h \ + GuiFloat.h \ + GuiFontExample.h \ + GuiGraphicsDialog.h \ GuiImplementation.h \ + GuiInclude.h \ + GuiIndex.h \ + GuiKeySymbol.h \ + GuiListings.h \ + GuiLog.h \ + GuiMathMatrixDialog.h \ + GuiMenubar.h \ + GuiNomencl.h \ + GuiNote.h \ + GuiParagraph.h \ + GuiPopupMenu.h \ + GuiPrefs.h \ + GuiPrintDialog.h \ + GuiRef.h \ + GuiSearch.h \ + GuiSelectionManager.h \ + GuiSendto.h \ + GuiSetBorder.h \ + GuiShowFile.h \ + GuiSpellchecker.h \ + GuiTabularCreate.h \ + GuiTabular.h \ + GuiTexinfo.h \ + GuiThesaurus.h \ + GuiToc.h \ + GuiToolbar.h \ + GuiURLDialog.h \ GuiView.h \ + GuiViewSource.h \ + GuiVSpace.h \ GuiWorkArea.h \ + GuiWrap.h \ IconPalette.h \ InsertTableWidget.h \ LengthCombo.h \ LyXFileDialog.h \ PanelStack.h \ - QAbout.h \ - QBibitem.h \ - QBibtex.h \ - QBox.h \ - QBranches.h \ - QBranch.h \ - QChanges.h \ - QCharacter.h \ - QCitationDialog.h \ - QCitation.h \ - QCommandBuffer.h \ - QCommandEdit.h \ - QDelimiterDialog.h \ - QDialogView.h \ - QDocument.h \ - QErrorList.h \ - QERT.h \ - QExternal.h \ - QFloatDialog.h \ - QFloat.h \ - QFontExample.h \ - QGraphicsDialog.h \ - QInclude.h \ - QIndex.h \ - QKeySymbol.h \ - QListings.h \ qlkey.h \ - QLMenubar.h \ - QLog.h \ - QLPopupMenu.h \ - QLPrintDialog.h \ - QLToolbar.h \ - QMathMatrixDialog.h \ - QNomencl.h \ - QNote.h \ - QParagraph.h \ - QPrefs.h \ - QRef.h \ - QSearch.h \ - QSelectionManager.h \ - QSendto.h \ - QSetBorder.h \ - QShowFile.h \ - QSpellchecker.h \ - QTabularCreate.h \ - QTabular.h \ - QTexinfo.h \ - QThesaurus.h \ - QToc.h \ - QURLDialog.h \ - QViewSource.h \ - QVSpace.h \ - QWrap.h \ socket_callback.h \ TocModel.h \ TocWidget.h \ diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp index 0e88f91a70..cf68a115a9 100644 --- a/src/frontends/qt4/TocModel.cpp +++ b/src/frontends/qt4/TocModel.cpp @@ -1,5 +1,5 @@ /** - * \file QTocDialog.C + * \file GuiTocDialog.C * 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.cpp b/src/frontends/qt4/TocWidget.cpp index c8e7c9c8cf..3394726c91 100644 --- a/src/frontends/qt4/TocWidget.cpp +++ b/src/frontends/qt4/TocWidget.cpp @@ -13,7 +13,7 @@ #include "TocWidget.h" -#include "QToc.h" +#include "GuiToc.h" #include "qt_helpers.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -42,7 +42,7 @@ using support::libFileSearch; namespace frontend { -TocWidget::TocWidget(QToc * form, QWidget * parent) +TocWidget::TocWidget(GuiToc * form, QWidget * parent) : QWidget(parent), form_(form), depth_(0) { setupUi(this); diff --git a/src/frontends/qt4/TocWidget.h b/src/frontends/qt4/TocWidget.h index 2516e3d046..3334f175af 100644 --- a/src/frontends/qt4/TocWidget.h +++ b/src/frontends/qt4/TocWidget.h @@ -20,12 +20,12 @@ namespace lyx { namespace frontend { -class QToc; +class GuiToc; -class TocWidget : public QWidget, public Ui::QTocUi { +class TocWidget : public QWidget, public Ui::TocUi { Q_OBJECT public: - TocWidget(QToc * form, QWidget * parent = 0); + TocWidget(GuiToc * form, QWidget * parent = 0); /// Update the display of the dialog whilst it is still visible. void update(); @@ -64,7 +64,7 @@ private: //This is a workaround for a problem of signals blocking. void disconnectSelectionModel(); - QToc * form_; + GuiToc * form_; /// depth of list shown int depth_; diff --git a/src/frontends/qt4/UrlView.cpp b/src/frontends/qt4/UrlView.cpp index 5d6dd23225..c1cab905c0 100644 --- a/src/frontends/qt4/UrlView.cpp +++ b/src/frontends/qt4/UrlView.cpp @@ -11,7 +11,7 @@ #include #include "UrlView.h" -#include "QURLDialog.h" +#include "GuiURLDialog.h" #include "Qt2BC.h" #include "qt_helpers.h" @@ -27,7 +27,7 @@ using std::string; namespace lyx { namespace frontend { -typedef QController< ControlCommand, QView > urlview_base_class; +typedef QController< ControlCommand, GuiView > urlview_base_class; UrlView::UrlView(Dialog & parent) : urlview_base_class(parent, _("URL")) @@ -37,7 +37,7 @@ UrlView::UrlView(Dialog & parent) void UrlView::build_dialog() { - dialog_.reset(new QURLDialog(this)); + dialog_.reset(new GuiURLDialog(this)); bcview().setOK(dialog_->okPB); bcview().setCancel(dialog_->closePB); diff --git a/src/frontends/qt4/UrlView.h b/src/frontends/qt4/UrlView.h index ccd6240b66..a46ed93388 100644 --- a/src/frontends/qt4/UrlView.h +++ b/src/frontends/qt4/UrlView.h @@ -12,8 +12,8 @@ #ifndef QT4_URL_VIEW_H #define QT4_URL_VIEW_H -#include "QDialogView.h" -#include "QURLDialog.h" +#include "GuiDialogView.h" +#include "GuiURLDialog.h" namespace lyx { namespace frontend { @@ -21,7 +21,7 @@ namespace frontend { class ControlCommand; class UrlView : - public QController > + public QController > { public: friend class QURLDialog; diff --git a/src/frontends/qt4/qt_helpers.h b/src/frontends/qt4/qt_helpers.h index d1623b5a78..575bdf0146 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.cpp). +//GuiGraphics.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/AboutUi.ui b/src/frontends/qt4/ui/AboutUi.ui index 8ed2910310..af52b3313b 100644 --- a/src/frontends/qt4/ui/AboutUi.ui +++ b/src/frontends/qt4/ui/AboutUi.ui @@ -2,8 +2,8 @@ - QAboutUi - + AboutUi + 0 diff --git a/src/frontends/qt4/ui/AskForTextUi.ui b/src/frontends/qt4/ui/AskForTextUi.ui index ed66f7ba83..2a5520adaa 100644 --- a/src/frontends/qt4/ui/AskForTextUi.ui +++ b/src/frontends/qt4/ui/AskForTextUi.ui @@ -2,8 +2,8 @@ - QAskForTextUi - + AskForTextUi + 0 diff --git a/src/frontends/qt4/ui/BibitemUi.ui b/src/frontends/qt4/ui/BibitemUi.ui index 8588383c4c..ee7cb1c364 100644 --- a/src/frontends/qt4/ui/BibitemUi.ui +++ b/src/frontends/qt4/ui/BibitemUi.ui @@ -2,8 +2,8 @@ - QBibitemUi - + BibitemUi + 0 diff --git a/src/frontends/qt4/ui/BibtexAddUi.ui b/src/frontends/qt4/ui/BibtexAddUi.ui index f3b4bc0982..5ab18e7f28 100644 --- a/src/frontends/qt4/ui/BibtexAddUi.ui +++ b/src/frontends/qt4/ui/BibtexAddUi.ui @@ -2,8 +2,8 @@ - QBibtexAddUi - + BibtexAddUi + 0 diff --git a/src/frontends/qt4/ui/BibtexUi.ui b/src/frontends/qt4/ui/BibtexUi.ui index 792e62a87f..1879c47258 100644 --- a/src/frontends/qt4/ui/BibtexUi.ui +++ b/src/frontends/qt4/ui/BibtexUi.ui @@ -2,8 +2,8 @@ - QBibtexUi - + BibtexUi + 0 diff --git a/src/frontends/qt4/ui/BoxUi.ui b/src/frontends/qt4/ui/BoxUi.ui index 5e6c4c21e8..02944c5fef 100644 --- a/src/frontends/qt4/ui/BoxUi.ui +++ b/src/frontends/qt4/ui/BoxUi.ui @@ -2,8 +2,8 @@ - QBoxUi - + BoxUi + 0 diff --git a/src/frontends/qt4/ui/BranchUi.ui b/src/frontends/qt4/ui/BranchUi.ui index 2be531b05c..d67333ea73 100644 --- a/src/frontends/qt4/ui/BranchUi.ui +++ b/src/frontends/qt4/ui/BranchUi.ui @@ -2,8 +2,8 @@ - QBranchUi - + BranchUi + 0 diff --git a/src/frontends/qt4/ui/ChangesUi.ui b/src/frontends/qt4/ui/ChangesUi.ui index 5fdef6f206..1e2a835dbb 100644 --- a/src/frontends/qt4/ui/ChangesUi.ui +++ b/src/frontends/qt4/ui/ChangesUi.ui @@ -2,8 +2,8 @@ - QChangesUi - + ChangesUi + 0 diff --git a/src/frontends/qt4/ui/CharacterUi.ui b/src/frontends/qt4/ui/CharacterUi.ui index 9eba9fd01e..1338d79af6 100644 --- a/src/frontends/qt4/ui/CharacterUi.ui +++ b/src/frontends/qt4/ui/CharacterUi.ui @@ -1,6 +1,6 @@ - QCharacterUi - + CharacterUi + 0 diff --git a/src/frontends/qt4/ui/CitationUi.ui b/src/frontends/qt4/ui/CitationUi.ui index fa1d98ad2c..578afce4f6 100644 --- a/src/frontends/qt4/ui/CitationUi.ui +++ b/src/frontends/qt4/ui/CitationUi.ui @@ -1,6 +1,6 @@ - QCitationUi - + CitationUi + 0 diff --git a/src/frontends/qt4/ui/DelimiterUi.ui b/src/frontends/qt4/ui/DelimiterUi.ui index 36b3839aa7..ef56636ae6 100644 --- a/src/frontends/qt4/ui/DelimiterUi.ui +++ b/src/frontends/qt4/ui/DelimiterUi.ui @@ -1,6 +1,6 @@ - QDelimiterUi - + DelimiterUi + 0 diff --git a/src/frontends/qt4/ui/DocumentUi.ui b/src/frontends/qt4/ui/DocumentUi.ui index 5fc980d2b5..2c555b4bab 100644 --- a/src/frontends/qt4/ui/DocumentUi.ui +++ b/src/frontends/qt4/ui/DocumentUi.ui @@ -2,8 +2,8 @@ - QDocumentUi - + DocumentUi + 0 diff --git a/src/frontends/qt4/ui/ERTUi.ui b/src/frontends/qt4/ui/ERTUi.ui index 2cecc01870..a91357c2ae 100644 --- a/src/frontends/qt4/ui/ERTUi.ui +++ b/src/frontends/qt4/ui/ERTUi.ui @@ -2,8 +2,8 @@ - QERTUi - + ERTUi + 0 diff --git a/src/frontends/qt4/ui/ErrorListUi.ui b/src/frontends/qt4/ui/ErrorListUi.ui index 9fffa9af30..024202482f 100644 --- a/src/frontends/qt4/ui/ErrorListUi.ui +++ b/src/frontends/qt4/ui/ErrorListUi.ui @@ -2,8 +2,8 @@ - QErrorListUi - + ErrorListUi + 0 diff --git a/src/frontends/qt4/ui/ExternalUi.ui b/src/frontends/qt4/ui/ExternalUi.ui index bdea5d5107..2c018516b9 100644 --- a/src/frontends/qt4/ui/ExternalUi.ui +++ b/src/frontends/qt4/ui/ExternalUi.ui @@ -2,8 +2,8 @@ - QExternalUi - + ExternalUi + 0 diff --git a/src/frontends/qt4/ui/FloatUi.ui b/src/frontends/qt4/ui/FloatUi.ui index d5a6efc8f1..69d415d98a 100644 --- a/src/frontends/qt4/ui/FloatUi.ui +++ b/src/frontends/qt4/ui/FloatUi.ui @@ -2,8 +2,8 @@ - QFloatUi - + FloatUi + 0 diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui index 40c8186a76..ff70d6d77a 100644 --- a/src/frontends/qt4/ui/GraphicsUi.ui +++ b/src/frontends/qt4/ui/GraphicsUi.ui @@ -1,6 +1,6 @@ - QGraphicsUi - + GraphicsUi + 0 diff --git a/src/frontends/qt4/ui/IncludeUi.ui b/src/frontends/qt4/ui/IncludeUi.ui index 402d74c57b..2c3e6b65fa 100644 --- a/src/frontends/qt4/ui/IncludeUi.ui +++ b/src/frontends/qt4/ui/IncludeUi.ui @@ -1,6 +1,6 @@ - QIncludeUi - + IncludeUi + 0 diff --git a/src/frontends/qt4/ui/IndexUi.ui b/src/frontends/qt4/ui/IndexUi.ui index c2e856d5f2..76895fdfd5 100644 --- a/src/frontends/qt4/ui/IndexUi.ui +++ b/src/frontends/qt4/ui/IndexUi.ui @@ -1,6 +1,6 @@ - QIndexUi - + IndexUi + 0 diff --git a/src/frontends/qt4/ui/ListingsUi.ui b/src/frontends/qt4/ui/ListingsUi.ui index 5a496e64de..8fb82abd12 100644 --- a/src/frontends/qt4/ui/ListingsUi.ui +++ b/src/frontends/qt4/ui/ListingsUi.ui @@ -1,6 +1,6 @@ - QListingsUi - + ListingsUi + Qt::NonModal diff --git a/src/frontends/qt4/ui/LogUi.ui b/src/frontends/qt4/ui/LogUi.ui index 38081b1756..c986f461c4 100644 --- a/src/frontends/qt4/ui/LogUi.ui +++ b/src/frontends/qt4/ui/LogUi.ui @@ -1,9 +1,6 @@ - - - - QLogUi - + LogUi + 0 diff --git a/src/frontends/qt4/ui/MathMatrixUi.ui b/src/frontends/qt4/ui/MathMatrixUi.ui index 89e525ac6e..93b470bbf2 100644 --- a/src/frontends/qt4/ui/MathMatrixUi.ui +++ b/src/frontends/qt4/ui/MathMatrixUi.ui @@ -1,9 +1,6 @@ - - - - QMathMatrixUi - + MathMatrixUi + 0 diff --git a/src/frontends/qt4/ui/MathsUi.ui b/src/frontends/qt4/ui/MathsUi.ui index 6b01c042c7..d1c704d2c8 100644 --- a/src/frontends/qt4/ui/MathsUi.ui +++ b/src/frontends/qt4/ui/MathsUi.ui @@ -1,7 +1,4 @@ - - - MathsUi diff --git a/src/frontends/qt4/ui/NomenclUi.ui b/src/frontends/qt4/ui/NomenclUi.ui index b3a9f346e0..74788d07bb 100644 --- a/src/frontends/qt4/ui/NomenclUi.ui +++ b/src/frontends/qt4/ui/NomenclUi.ui @@ -1,6 +1,6 @@ - QNomenclUi - + NomenclUi + 0 diff --git a/src/frontends/qt4/ui/NoteUi.ui b/src/frontends/qt4/ui/NoteUi.ui index a1f941cf87..10f45a043d 100644 --- a/src/frontends/qt4/ui/NoteUi.ui +++ b/src/frontends/qt4/ui/NoteUi.ui @@ -1,9 +1,6 @@ - - - - QNoteUi - + NoteUi + 0 diff --git a/src/frontends/qt4/ui/NumberingUi.ui b/src/frontends/qt4/ui/NumberingUi.ui index 4aa71913af..d7c3d4806a 100644 --- a/src/frontends/qt4/ui/NumberingUi.ui +++ b/src/frontends/qt4/ui/NumberingUi.ui @@ -1,7 +1,4 @@ - - - NumberingUi diff --git a/src/frontends/qt4/ui/PageLayoutUi.ui b/src/frontends/qt4/ui/PageLayoutUi.ui index f574d63442..7261b5f3bd 100644 --- a/src/frontends/qt4/ui/PageLayoutUi.ui +++ b/src/frontends/qt4/ui/PageLayoutUi.ui @@ -1,7 +1,4 @@ - - - PageLayoutUi diff --git a/src/frontends/qt4/ui/ParagraphUi.ui b/src/frontends/qt4/ui/ParagraphUi.ui index 5fe2a27ed5..ba00bbdb1a 100644 --- a/src/frontends/qt4/ui/ParagraphUi.ui +++ b/src/frontends/qt4/ui/ParagraphUi.ui @@ -1,6 +1,6 @@ - QParagraphUi - + ParagraphUi + Qt::ApplicationModal diff --git a/src/frontends/qt4/ui/PreambleUi.ui b/src/frontends/qt4/ui/PreambleUi.ui index 6ccb62c707..effc54441b 100644 --- a/src/frontends/qt4/ui/PreambleUi.ui +++ b/src/frontends/qt4/ui/PreambleUi.ui @@ -1,7 +1,4 @@ - - - PreambleUi diff --git a/src/frontends/qt4/ui/PrefColorsUi.ui b/src/frontends/qt4/ui/PrefColorsUi.ui index 6ea9fe238d..5ae88236bb 100644 --- a/src/frontends/qt4/ui/PrefColorsUi.ui +++ b/src/frontends/qt4/ui/PrefColorsUi.ui @@ -1,6 +1,6 @@ - QPrefColorsUi - + PrefColorsUi + 0 diff --git a/src/frontends/qt4/ui/PrefConvertersUi.ui b/src/frontends/qt4/ui/PrefConvertersUi.ui index affd1577ee..771e05e17c 100644 --- a/src/frontends/qt4/ui/PrefConvertersUi.ui +++ b/src/frontends/qt4/ui/PrefConvertersUi.ui @@ -1,6 +1,6 @@ - QPrefConvertersUi - + PrefConvertersUi + 0 diff --git a/src/frontends/qt4/ui/PrefCopiersUi.ui b/src/frontends/qt4/ui/PrefCopiersUi.ui index 6b7844f504..d3dfaa4426 100644 --- a/src/frontends/qt4/ui/PrefCopiersUi.ui +++ b/src/frontends/qt4/ui/PrefCopiersUi.ui @@ -1,6 +1,6 @@ - QPrefCopiersUi - + PrefCopiersUi + 0 diff --git a/src/frontends/qt4/ui/PrefCygwinPathUi.ui b/src/frontends/qt4/ui/PrefCygwinPathUi.ui index 550056c4bc..f0e807f9ed 100644 --- a/src/frontends/qt4/ui/PrefCygwinPathUi.ui +++ b/src/frontends/qt4/ui/PrefCygwinPathUi.ui @@ -1,6 +1,6 @@ - QPrefCygwinPathUi - + PrefCygwinPathUi + 0 diff --git a/src/frontends/qt4/ui/PrefDateUi.ui b/src/frontends/qt4/ui/PrefDateUi.ui index 0d2f958fbd..8a97c1c267 100644 --- a/src/frontends/qt4/ui/PrefDateUi.ui +++ b/src/frontends/qt4/ui/PrefDateUi.ui @@ -1,9 +1,6 @@ - - - - QPrefDateUi - + PrefDateUi + 0 diff --git a/src/frontends/qt4/ui/PrefDisplayUi.ui b/src/frontends/qt4/ui/PrefDisplayUi.ui index e96e8a8774..6ac03eff35 100644 --- a/src/frontends/qt4/ui/PrefDisplayUi.ui +++ b/src/frontends/qt4/ui/PrefDisplayUi.ui @@ -1,9 +1,6 @@ - - - - QPrefDisplayUi - + PrefDisplayUi + 0 diff --git a/src/frontends/qt4/ui/PrefFileformatsUi.ui b/src/frontends/qt4/ui/PrefFileformatsUi.ui index 2ca137b381..a64638bd17 100644 --- a/src/frontends/qt4/ui/PrefFileformatsUi.ui +++ b/src/frontends/qt4/ui/PrefFileformatsUi.ui @@ -1,6 +1,6 @@ - QPrefFileformatsUi - + PrefFileformatsUi + 0 diff --git a/src/frontends/qt4/ui/PrefIdentityUi.ui b/src/frontends/qt4/ui/PrefIdentityUi.ui index 336345e165..186b6aee65 100644 --- a/src/frontends/qt4/ui/PrefIdentityUi.ui +++ b/src/frontends/qt4/ui/PrefIdentityUi.ui @@ -1,9 +1,6 @@ - - - - QPrefIdentityUi - + PrefIdentityUi + 0 diff --git a/src/frontends/qt4/ui/PrefKeyboardUi.ui b/src/frontends/qt4/ui/PrefKeyboardUi.ui index ea65afb2d8..ca6c609f7c 100644 --- a/src/frontends/qt4/ui/PrefKeyboardUi.ui +++ b/src/frontends/qt4/ui/PrefKeyboardUi.ui @@ -1,6 +1,6 @@ - QPrefKeyboardUi - + PrefKeyboardUi + 0 diff --git a/src/frontends/qt4/ui/PrefLanguageUi.ui b/src/frontends/qt4/ui/PrefLanguageUi.ui index e11e254426..e2df16b99f 100644 --- a/src/frontends/qt4/ui/PrefLanguageUi.ui +++ b/src/frontends/qt4/ui/PrefLanguageUi.ui @@ -1,9 +1,6 @@ - - - - QPrefLanguageUi - + PrefLanguageUi + 0 diff --git a/src/frontends/qt4/ui/PrefLatexUi.ui b/src/frontends/qt4/ui/PrefLatexUi.ui index bcbee052e0..c3f81bfb32 100644 --- a/src/frontends/qt4/ui/PrefLatexUi.ui +++ b/src/frontends/qt4/ui/PrefLatexUi.ui @@ -1,9 +1,6 @@ - - - - QPrefLatexUi - + PrefLatexUi + 0 diff --git a/src/frontends/qt4/ui/PrefPathsUi.ui b/src/frontends/qt4/ui/PrefPathsUi.ui index e711d2ef0b..2d2489475c 100644 --- a/src/frontends/qt4/ui/PrefPathsUi.ui +++ b/src/frontends/qt4/ui/PrefPathsUi.ui @@ -1,9 +1,6 @@ - - - - QPrefPathsUi - + PrefPathsUi + 0 diff --git a/src/frontends/qt4/ui/PrefPlaintextUi.ui b/src/frontends/qt4/ui/PrefPlaintextUi.ui index cc8d164a78..6b3ceca853 100644 --- a/src/frontends/qt4/ui/PrefPlaintextUi.ui +++ b/src/frontends/qt4/ui/PrefPlaintextUi.ui @@ -1,9 +1,6 @@ - - - - QPrefPlaintextUi - + PrefPlaintextUi + 0 diff --git a/src/frontends/qt4/ui/PrefPrinterUi.ui b/src/frontends/qt4/ui/PrefPrinterUi.ui index 3f00f0b379..085caca58e 100644 --- a/src/frontends/qt4/ui/PrefPrinterUi.ui +++ b/src/frontends/qt4/ui/PrefPrinterUi.ui @@ -1,6 +1,6 @@ - QPrefPrinterUi - + PrefPrinterUi + 0 diff --git a/src/frontends/qt4/ui/PrefScreenFontsUi.ui b/src/frontends/qt4/ui/PrefScreenFontsUi.ui index 6a83d7c86c..5a23fdc17a 100644 --- a/src/frontends/qt4/ui/PrefScreenFontsUi.ui +++ b/src/frontends/qt4/ui/PrefScreenFontsUi.ui @@ -1,9 +1,6 @@ - - - - QPrefScreenFontsUi - + PrefScreenFontsUi + 0 @@ -46,7 +43,7 @@ - + 3 @@ -74,7 +71,7 @@ - + 3 @@ -119,7 +116,7 @@ - + 3 @@ -380,9 +377,9 @@ - QFontExample + GuiFontExample QWidget -
QFontExample.h
+
GuiFontExample.h
0 diff --git a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui index d8acecaa5b..8f757e311d 100644 --- a/src/frontends/qt4/ui/PrefSpellcheckerUi.ui +++ b/src/frontends/qt4/ui/PrefSpellcheckerUi.ui @@ -1,9 +1,6 @@ - - - - QPrefSpellcheckerUi - + PrefSpellcheckerUi + 0 diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui index 1760cc05d3..7dad6d6d3d 100644 --- a/src/frontends/qt4/ui/PrefUi.ui +++ b/src/frontends/qt4/ui/PrefUi.ui @@ -1,6 +1,6 @@ - QPrefUi - + PrefUi + 0 diff --git a/src/frontends/qt4/ui/PrefsUi.ui b/src/frontends/qt4/ui/PrefsUi.ui index c50cc61bd9..3827e1acc0 100644 --- a/src/frontends/qt4/ui/PrefsUi.ui +++ b/src/frontends/qt4/ui/PrefsUi.ui @@ -1,9 +1,6 @@ - - - - QPrefsUi - + PrefsUi + 0 diff --git a/src/frontends/qt4/ui/PrintUi.ui b/src/frontends/qt4/ui/PrintUi.ui index 91ac08a751..1a8c2e0c53 100644 --- a/src/frontends/qt4/ui/PrintUi.ui +++ b/src/frontends/qt4/ui/PrintUi.ui @@ -1,9 +1,6 @@ - - - - QPrintUi - + PrintUi + 0 diff --git a/src/frontends/qt4/ui/RefUi.ui b/src/frontends/qt4/ui/RefUi.ui index b2e7e225a7..d50f52266b 100644 --- a/src/frontends/qt4/ui/RefUi.ui +++ b/src/frontends/qt4/ui/RefUi.ui @@ -1,9 +1,6 @@ - - - - QRefUi - + RefUi + 0 diff --git a/src/frontends/qt4/ui/SearchUi.ui b/src/frontends/qt4/ui/SearchUi.ui index 5886c194fc..5fc233e223 100644 --- a/src/frontends/qt4/ui/SearchUi.ui +++ b/src/frontends/qt4/ui/SearchUi.ui @@ -1,9 +1,6 @@ - - - - QSearchUi - + SearchUi + 0 diff --git a/src/frontends/qt4/ui/SendtoUi.ui b/src/frontends/qt4/ui/SendtoUi.ui index 16f80b640e..5c56dc3a72 100644 --- a/src/frontends/qt4/ui/SendtoUi.ui +++ b/src/frontends/qt4/ui/SendtoUi.ui @@ -1,9 +1,6 @@ - - - - QSendtoUi - + SendtoUi + 0 diff --git a/src/frontends/qt4/ui/ShowFileUi.ui b/src/frontends/qt4/ui/ShowFileUi.ui index 80c99ea170..77c7cae916 100644 --- a/src/frontends/qt4/ui/ShowFileUi.ui +++ b/src/frontends/qt4/ui/ShowFileUi.ui @@ -1,9 +1,6 @@ - - - - QShowFileUi - + ShowFileUi + 0 diff --git a/src/frontends/qt4/ui/SpellcheckerUi.ui b/src/frontends/qt4/ui/SpellcheckerUi.ui index 1ac1591a6b..c2bc42de4b 100644 --- a/src/frontends/qt4/ui/SpellcheckerUi.ui +++ b/src/frontends/qt4/ui/SpellcheckerUi.ui @@ -1,9 +1,6 @@ - - - - QSpellcheckerUi - + SpellcheckerUi + 0 diff --git a/src/frontends/qt4/ui/TabularCreateUi.ui b/src/frontends/qt4/ui/TabularCreateUi.ui index e291f2aecc..2a1d662811 100644 --- a/src/frontends/qt4/ui/TabularCreateUi.ui +++ b/src/frontends/qt4/ui/TabularCreateUi.ui @@ -1,9 +1,6 @@ - - - - QTabularCreateUi - + TabularCreateUi + 0 diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui index 2bcd92980c..1173175986 100644 --- a/src/frontends/qt4/ui/TabularUi.ui +++ b/src/frontends/qt4/ui/TabularUi.ui @@ -1,9 +1,6 @@ - - - - QTabularUi - + TabularUi + 0 @@ -647,7 +644,7 @@ 6 - + 1 @@ -1152,9 +1149,9 @@ - QSetBorder + GuiSetBorder QWidget -
QSetBorder.h
+
GuiSetBorder.h
0 diff --git a/src/frontends/qt4/ui/TexinfoUi.ui b/src/frontends/qt4/ui/TexinfoUi.ui index 27bab2c7db..06a254576f 100644 --- a/src/frontends/qt4/ui/TexinfoUi.ui +++ b/src/frontends/qt4/ui/TexinfoUi.ui @@ -1,6 +1,6 @@ - QTexinfoUi - + TexinfoUi + 0 diff --git a/src/frontends/qt4/ui/ThesaurusUi.ui b/src/frontends/qt4/ui/ThesaurusUi.ui index 1514d41af2..9aaca44fce 100644 --- a/src/frontends/qt4/ui/ThesaurusUi.ui +++ b/src/frontends/qt4/ui/ThesaurusUi.ui @@ -1,9 +1,6 @@ - - - - QThesaurusUi - + ThesaurusUi + 0 diff --git a/src/frontends/qt4/ui/TocUi.ui b/src/frontends/qt4/ui/TocUi.ui index adc8834895..bed142ab54 100644 --- a/src/frontends/qt4/ui/TocUi.ui +++ b/src/frontends/qt4/ui/TocUi.ui @@ -1,6 +1,6 @@ - QTocUi - + TocUi + Qt::NonModal diff --git a/src/frontends/qt4/ui/URLUi.ui b/src/frontends/qt4/ui/URLUi.ui index 766bb12c7c..e7a81fb748 100644 --- a/src/frontends/qt4/ui/URLUi.ui +++ b/src/frontends/qt4/ui/URLUi.ui @@ -1,9 +1,6 @@ - - - - QURLUi - + URLUi + 0 diff --git a/src/frontends/qt4/ui/VSpaceUi.ui b/src/frontends/qt4/ui/VSpaceUi.ui index ddea6c863e..f8b942a438 100644 --- a/src/frontends/qt4/ui/VSpaceUi.ui +++ b/src/frontends/qt4/ui/VSpaceUi.ui @@ -1,6 +1,6 @@ - QVSpaceUi - + VSpaceUi + 0 diff --git a/src/frontends/qt4/ui/ViewSourceUi.ui b/src/frontends/qt4/ui/ViewSourceUi.ui index c8ec9545f1..51486a6591 100644 --- a/src/frontends/qt4/ui/ViewSourceUi.ui +++ b/src/frontends/qt4/ui/ViewSourceUi.ui @@ -1,6 +1,6 @@ - QViewSourceUi - + ViewSourceUi + 0 diff --git a/src/frontends/qt4/ui/WrapUi.ui b/src/frontends/qt4/ui/WrapUi.ui index 1dc89b7ff0..dd8ff3121b 100644 --- a/src/frontends/qt4/ui/WrapUi.ui +++ b/src/frontends/qt4/ui/WrapUi.ui @@ -1,9 +1,6 @@ - - - - QWrapUi - + WrapUi + 0 -- 2.39.2