From 7986fbd08d5a449b2a64967b4790ae37742dee84 Mon Sep 17 00:00:00 2001 From: hjk Date: Sat, 7 Jan 2012 16:55:09 +0100 Subject: [PATCH] cvs: polish style Change-Id: Ica92448617e46223f99a5009e4a7493b83d4cda9 Reviewed-by: Friedemann Kleint --- share/qtcreator/translations/qtcreator_cs.ts | 18 +- share/qtcreator/translations/qtcreator_de.ts | 16 +- share/qtcreator/translations/qtcreator_es.ts | 14 +- share/qtcreator/translations/qtcreator_fr.ts | 18 +- share/qtcreator/translations/qtcreator_hu.ts | 14 +- share/qtcreator/translations/qtcreator_it.ts | 14 +- share/qtcreator/translations/qtcreator_ja.ts | 16 +- share/qtcreator/translations/qtcreator_pl.ts | 16 +- share/qtcreator/translations/qtcreator_ru.ts | 16 +- share/qtcreator/translations/qtcreator_sl.ts | 16 +- share/qtcreator/translations/qtcreator_uk.ts | 16 +- .../qtcreator/translations/qtcreator_zh_CN.ts | 18 +- src/plugins/cvs/annotationhighlighter.cpp | 10 +- src/plugins/cvs/annotationhighlighter.h | 13 +- src/plugins/cvs/checkoutwizard.cpp | 8 +- src/plugins/cvs/checkoutwizard.h | 16 +- src/plugins/cvs/checkoutwizardpage.cpp | 4 +- src/plugins/cvs/checkoutwizardpage.h | 9 +- src/plugins/cvs/cvsconstants.h | 4 +- src/plugins/cvs/cvscontrol.cpp | 46 +- src/plugins/cvs/cvscontrol.h | 12 +- src/plugins/cvs/cvseditor.cpp | 20 +- src/plugins/cvs/cvseditor.h | 20 +- src/plugins/cvs/cvsplugin.cpp | 563 +++++++++--------- src/plugins/cvs/cvsplugin.h | 63 +- src/plugins/cvs/cvssettings.cpp | 14 +- src/plugins/cvs/cvssettings.h | 18 +- src/plugins/cvs/cvssubmiteditor.cpp | 17 +- src/plugins/cvs/cvssubmiteditor.h | 15 +- src/plugins/cvs/cvsutils.cpp | 38 +- src/plugins/cvs/cvsutils.h | 24 +- src/plugins/cvs/settingspage.cpp | 16 +- src/plugins/cvs/settingspage.h | 18 +- 33 files changed, 571 insertions(+), 569 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index f2f854cc29..6b15d1a877 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -15084,7 +15084,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage Prompt to submit Potvrdit předložení @@ -16920,7 +16920,7 @@ Abyste to provedl, napište tuto zkraku v zadávacím poli vyhledávače, násle - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a project from a CVS repository. Odhlásí projekt ze skladiště CVS. @@ -16935,7 +16935,7 @@ Abyste to provedl, napište tuto zkraku v zadávacím poli vyhledávače, násle - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location Umístění @@ -16950,14 +16950,14 @@ Abyste to provedl, napište tuto zkraku v zadávacím poli vyhledávače, násle - CVSPlugin + CvsPlugin Cannot find repository for '%1' Nelze najít skladiště pro '%1' - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed Nepodařilo se vyhodnotit výstup zapisu @@ -17273,7 +17273,7 @@ Abyste to provedl, napište tuto zkraku v zadávacím poli vyhledávače, násle - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added Přidáno @@ -17292,7 +17292,7 @@ Abyste to provedl, napište tuto zkraku v zadávacím poli vyhledávače, násle - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command Příkaz CVS @@ -22836,7 +22836,7 @@ Desetinná hodnota se znaménkem (velký endian): %4 - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" Opatřit vysvětlivkami revizi "%1" @@ -30981,7 +30981,7 @@ Poznámka: Podle okolností by mohlo dojít ke smazání místního souboru. - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace Nevšímat si mezer diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 524c3c057c..58982b4e0c 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -426,7 +426,7 @@ - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed Die Log-Ausgabe konnte nicht ausgewertet werden @@ -678,7 +678,7 @@ - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added Hinzugefügt @@ -693,7 +693,7 @@ - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a CVS repository and tries to load the contained project. Erstellt einen Checkout eines CVS-Repositories und versucht, das darin enthaltene Projekt zu laden. @@ -704,7 +704,7 @@ - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location Pfad @@ -719,7 +719,7 @@ - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage CVS CVS @@ -766,7 +766,7 @@ - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command CVS-Kommando @@ -12006,7 +12006,7 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen. - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" Annotation für Revision "%1" @@ -22407,7 +22407,7 @@ Sollen sie überschrieben werden? - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace Leerzeichen nicht berücksichtigen diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 27e9055bd2..271179cd85 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -13823,7 +13823,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage Prompt to submit @@ -14953,7 +14953,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a project from a CVS repository. @@ -14966,7 +14966,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Specify repository and path. @@ -14979,7 +14979,7 @@ p, li { white-space: pre-wrap; } - CVSPlugin + CvsPlugin Cannot find repository for '%1' @@ -14987,7 +14987,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed @@ -15227,7 +15227,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added @@ -15250,7 +15250,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 739ecd981c..437b4ebae2 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -17824,7 +17824,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage Prompt to submit Invite lors du submit @@ -19262,7 +19262,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a project from a CVS repository. Obtient un projet à partir d'un dépôt CVS. @@ -19277,7 +19277,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location Emplacement @@ -19292,14 +19292,14 @@ p, li { white-space: pre-wrap; } - CVSPlugin + CvsPlugin Cannot find repository for '%1' Impossible de trouver le dépot de "%1" - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed Échec de l'analyse de la sortie @@ -19615,7 +19615,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added Ajouté @@ -19634,7 +19634,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command CVS Command @@ -24973,7 +24973,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" Révision annotée "%1" @@ -41694,7 +41694,7 @@ Would you like to overwrite them? - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace Ignorer les espaces diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 6ca8893ccb..2bd523e8c2 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -646,7 +646,7 @@ - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed A log kimenet elemzése nem sikerült @@ -839,7 +839,7 @@ - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added Hozzáadva @@ -858,7 +858,7 @@ - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a project from a CVS repository. Egy projekt megnézése egy CVS tárolóból. @@ -869,7 +869,7 @@ - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Specify repository and path. Határozza meg a tárolót és az útvonalat. @@ -880,7 +880,7 @@ - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage Prompt to submit Feltöltési prompt @@ -911,14 +911,14 @@ - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command CVS parancs - CVSPlugin + CvsPlugin Cannot find repository for '%1' '%1' tárolóra nem található diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 8c5b9bb088..ae549308f9 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -13794,7 +13794,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage Prompt to submit @@ -14934,7 +14934,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a project from a CVS repository. @@ -14947,7 +14947,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Specify repository and path. @@ -14960,7 +14960,7 @@ p, li { white-space: pre-wrap; } - CVSPlugin + CvsPlugin Cannot find repository for '%1' @@ -14968,7 +14968,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed @@ -15208,7 +15208,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added @@ -15231,7 +15231,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 64c63f6ddb..05cd076697 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -1715,14 +1715,14 @@ Backspace が押された時のインデントの動作を指定します。 - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" リビジョン "%1" のアノテーション - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed ログ出力のパースに失敗しました @@ -1973,7 +1973,7 @@ Backspace が押された時のインデントの動作を指定します。 - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added 追加 @@ -1988,7 +1988,7 @@ Backspace が押された時のインデントの動作を指定します。 - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a CVS repository and tries to load the contained project. CVS リポジトリをチェックアウトし、プロジェクトに読み込みます。 @@ -1999,7 +1999,7 @@ Backspace が押された時のインデントの動作を指定します。 - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location パス @@ -2014,7 +2014,7 @@ Backspace が押された時のインデントの動作を指定します。 - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace 空白を無視 @@ -2025,7 +2025,7 @@ Backspace が押された時のインデントの動作を指定します。 - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage CVS CVS @@ -2072,7 +2072,7 @@ Backspace が押された時のインデントの動作を指定します。 - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command CVS コマンド diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 3c7b82bc22..6eceac6aa6 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -598,7 +598,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage CVS CVS @@ -4438,7 +4438,7 @@ Przyczyna: %3 - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a CVS repository and tries to load the contained project. Wyciąga repozytorium CVS i próbuje załadować zawarty projekt. @@ -4449,7 +4449,7 @@ Przyczyna: %3 - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location Położenie @@ -4464,7 +4464,7 @@ Przyczyna: %3 - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed Nie można przetworzyć komunikatów loga @@ -4715,7 +4715,7 @@ Przyczyna: %3 - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added Dodano @@ -4730,7 +4730,7 @@ Przyczyna: %3 - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command Komenda CVS @@ -13227,7 +13227,7 @@ Użyj właściwości importPaths dla projektów qmlproject aby dodać scieżki i - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" Dołącz adnotację do poprawki "%1" @@ -24232,7 +24232,7 @@ Czy chcesz je nadpisać? - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace Ignoruj białe znaki diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index a60815560e..3759b6c771 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -1729,14 +1729,14 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" Аннотация ревизии «%1» - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed Не удалось разобрать историю @@ -1987,7 +1987,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added Добавлен @@ -2002,7 +2002,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a CVS repository and tries to load the contained project. Извлечение хранилища CVS с последующей попыткой загрузки содержащегося там проекта. @@ -2013,7 +2013,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location Размещение @@ -2028,7 +2028,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace Пропускать пробелы @@ -2039,7 +2039,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage CVS CVS @@ -2086,7 +2086,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command Команда CVS diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 95282af229..7b4ab333d3 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -13618,7 +13618,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage CVS @@ -15133,7 +15133,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a CVS repository and tries to load the contained project. @@ -15146,7 +15146,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location @@ -15164,7 +15164,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed @@ -15518,7 +15518,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added @@ -15536,7 +15536,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command @@ -19428,7 +19428,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" @@ -27974,7 +27974,7 @@ Vedite: to lahko odstrani krajevno datoteko. - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 9a1cdc1266..837bc8e313 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -1731,14 +1731,14 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Cannot find repository for '%1' @@ -1989,7 +1989,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added @@ -2004,7 +2004,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a CVS repository and tries to load the contained project. @@ -2015,7 +2015,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location Розташування @@ -2030,7 +2030,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace Ігнорувати пропуски @@ -2041,7 +2041,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage Configuration @@ -2088,7 +2088,7 @@ Specifies how backspace interacts with indentation. - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command Команда CVS diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 42c003fa65..ebb0be6b7c 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -17165,7 +17165,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPage + Cvs::Internal::SettingsPage CVS Command: CVS 命令: @@ -18580,7 +18580,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizard + Cvs::Internal::CheckoutWizard Checks out a project from a CVS repository. 从CVS仓库中检出项目。 @@ -18595,7 +18595,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CheckoutWizardPage + Cvs::Internal::CheckoutWizardPage Location 位置 @@ -18610,14 +18610,14 @@ p, li { white-space: pre-wrap; } - CVSPlugin + CvsPlugin Cannot find repository for '%1' 无法为'%1'找到仓库 - CVS::Internal::CVSPlugin + Cvs::Internal::CvsPlugin Parsing of the log output failed 解析日志输出失败 @@ -18928,7 +18928,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::CVSSubmitEditor + Cvs::Internal::CvsSubmitEditor Added 已添加 @@ -18943,7 +18943,7 @@ p, li { white-space: pre-wrap; } - CVS::Internal::SettingsPageWidget + Cvs::Internal::SettingsPageWidget CVS Command CVS 命令 @@ -23494,7 +23494,7 @@ Previous decimal signed value (big endian): %4 - CVS::Internal::CVSEditor + Cvs::Internal::CvsEditor Annotate revision "%1" 注释版本 "%1" @@ -40575,7 +40575,7 @@ Would you like to overwrite them? - CVS::Internal::CvsDiffParameterWidget + Cvs::Internal::CvsDiffParameterWidget Ignore whitespace 忽略空白 diff --git a/src/plugins/cvs/annotationhighlighter.cpp b/src/plugins/cvs/annotationhighlighter.cpp index 4e1e1967b8..4e0de08fb9 100644 --- a/src/plugins/cvs/annotationhighlighter.cpp +++ b/src/plugins/cvs/annotationhighlighter.cpp @@ -32,17 +32,17 @@ #include "annotationhighlighter.h" -using namespace CVS; -using namespace CVS::Internal; +using namespace Cvs; +using namespace Cvs::Internal; -CVSAnnotationHighlighter::CVSAnnotationHighlighter(const ChangeNumbers &changeNumbers, - QTextDocument *document) : +CvsAnnotationHighlighter::CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers, + QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(changeNumbers, document), m_blank(QLatin1Char(' ')) { } -QString CVSAnnotationHighlighter::changeNumber(const QString &block) const +QString CvsAnnotationHighlighter::changeNumber(const QString &block) const { const int pos = block.indexOf(m_blank); return pos > 1 ? block.left(pos) : QString(); diff --git a/src/plugins/cvs/annotationhighlighter.h b/src/plugins/cvs/annotationhighlighter.h index e0cd303651..5f29c07a04 100644 --- a/src/plugins/cvs/annotationhighlighter.h +++ b/src/plugins/cvs/annotationhighlighter.h @@ -35,24 +35,25 @@ #include -namespace CVS { +namespace Cvs { namespace Internal { // Annotation highlighter for cvs triggering on 'changenumber ' -class CVSAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter +class CvsAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { Q_OBJECT + public: - explicit CVSAnnotationHighlighter(const ChangeNumbers &changeNumbers, - QTextDocument *document = 0); + explicit CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers, + QTextDocument *document = 0); private: - virtual QString changeNumber(const QString &block) const; + QString changeNumber(const QString &block) const; const QChar m_blank; }; } // namespace Internal -} // namespace CVS +} // namespace Cvs #endif // ANNOTATIONHIGHLIGHTER_H diff --git a/src/plugins/cvs/checkoutwizard.cpp b/src/plugins/cvs/checkoutwizard.cpp index f7a93fe979..4842482ef8 100644 --- a/src/plugins/cvs/checkoutwizard.cpp +++ b/src/plugins/cvs/checkoutwizard.cpp @@ -42,7 +42,7 @@ #include -namespace CVS { +namespace Cvs { namespace Internal { CheckoutWizard::CheckoutWizard(QObject *parent) : @@ -69,7 +69,7 @@ QString CheckoutWizard::displayName() const QList CheckoutWizard::createParameterPages(const QString &path) { QList rc; - const Core::IVersionControl *vc = CVSPlugin::instance()->versionControl(); + const Core::IVersionControl *vc = CvsPlugin::instance()->versionControl(); if (!vc->isConfigured()) rc.append(new VcsBase::VcsConfigurationPage(vc)); CheckoutWizardPage *cwp = new CheckoutWizardPage; @@ -85,7 +85,7 @@ QSharedPointer CheckoutWizard::createJob(const QLi // CVS does not allow for checking out into a different directory. const CheckoutWizardPage *cwp = qobject_cast(parameterPages.front()); QTC_ASSERT(cwp, return QSharedPointer()) - const CVSSettings settings = CVSPlugin::instance()->settings(); + const CvsSettings settings = CvsPlugin::instance()->settings(); const QString binary = settings.cvsCommand; QStringList args; const QString repository = cwp->repository(); @@ -99,4 +99,4 @@ QSharedPointer CheckoutWizard::createJob(const QLi } } // namespace Internal -} // namespace CVS +} // namespace Cvs diff --git a/src/plugins/cvs/checkoutwizard.h b/src/plugins/cvs/checkoutwizard.h index 0953a62e77..b864283f4e 100644 --- a/src/plugins/cvs/checkoutwizard.h +++ b/src/plugins/cvs/checkoutwizard.h @@ -35,7 +35,7 @@ #include -namespace CVS { +namespace Cvs { namespace Internal { class CheckoutWizard : public VcsBase::BaseCheckoutWizard @@ -45,18 +45,18 @@ public: explicit CheckoutWizard(QObject *parent = 0); // IWizard - virtual QIcon icon() const; - virtual QString description() const; - virtual QString displayName() const; + QIcon icon() const; + QString description() const; + QString displayName() const; protected: // BaseCheckoutWizard - virtual QList createParameterPages(const QString &path); - virtual QSharedPointer createJob(const QList ¶meterPage, - QString *checkoutPath); + QList createParameterPages(const QString &path); + QSharedPointer createJob(const QList ¶meterPage, + QString *checkoutPath); }; } // namespace Internal -} // namespace CVS +} // namespace Cvs #endif // CHECKOUTWIZARD_H diff --git a/src/plugins/cvs/checkoutwizardpage.cpp b/src/plugins/cvs/checkoutwizardpage.cpp index d4709e80d2..59ed92ec47 100644 --- a/src/plugins/cvs/checkoutwizardpage.cpp +++ b/src/plugins/cvs/checkoutwizardpage.cpp @@ -32,7 +32,7 @@ #include "checkoutwizardpage.h" -namespace CVS { +namespace Cvs { namespace Internal { CheckoutWizardPage::CheckoutWizardPage(QWidget *parent) : @@ -46,4 +46,4 @@ CheckoutWizardPage::CheckoutWizardPage(QWidget *parent) : } } // namespace Internal -} // namespace CVS +} // namespace Cvs diff --git a/src/plugins/cvs/checkoutwizardpage.h b/src/plugins/cvs/checkoutwizardpage.h index 8a036bd739..ce25b301f0 100644 --- a/src/plugins/cvs/checkoutwizardpage.h +++ b/src/plugins/cvs/checkoutwizardpage.h @@ -35,15 +35,18 @@ #include -namespace CVS { +namespace Cvs { namespace Internal { -class CheckoutWizardPage : public VcsBase::BaseCheckoutWizardPage { +class CheckoutWizardPage : public VcsBase::BaseCheckoutWizardPage +{ Q_OBJECT + public: CheckoutWizardPage(QWidget *parent = 0); }; } // namespace Internal -} // namespace CVS +} // namespace Cvs + #endif // CHECKOUTWIZARDPAGE_H diff --git a/src/plugins/cvs/cvsconstants.h b/src/plugins/cvs/cvsconstants.h index b7f295740a..629d31157e 100644 --- a/src/plugins/cvs/cvsconstants.h +++ b/src/plugins/cvs/cvsconstants.h @@ -33,7 +33,7 @@ #ifndef CVS_CONSTANTS_H #define CVS_CONSTANTS_H -namespace CVS { +namespace Cvs { namespace Constants { const char CVS_SUBMIT_MIMETYPE[] = "application/vnd.nokia.text.cvs.submit"; @@ -45,6 +45,6 @@ const char DIFF_SELECTED[] = "CVS.DiffSelectedFilesInLog"; enum { debug = 0 }; } // namespace Constants -} // namespace CVS +} // namespace Cvs #endif // CVS_CONSTANTS_H diff --git a/src/plugins/cvs/cvscontrol.cpp b/src/plugins/cvs/cvscontrol.cpp index 896cc53864..3b9d417a7b 100644 --- a/src/plugins/cvs/cvscontrol.cpp +++ b/src/plugins/cvs/cvscontrol.cpp @@ -38,25 +38,25 @@ #include -using namespace CVS; -using namespace CVS::Internal; +using namespace Cvs; +using namespace Cvs::Internal; -CVSControl::CVSControl(CVSPlugin *plugin) : +CvsControl::CvsControl(CvsPlugin *plugin) : m_plugin(plugin) { } -QString CVSControl::displayName() const +QString CvsControl::displayName() const { return QLatin1String("cvs"); } -Core::Id CVSControl::id() const +Core::Id CvsControl::id() const { return VcsBase::Constants::VCS_ID_CVS; } -bool CVSControl::isConfigured() const +bool CvsControl::isConfigured() const { const QString binary = m_plugin->settings().cvsCommand; if (binary.isEmpty()) @@ -65,7 +65,7 @@ bool CVSControl::isConfigured() const return fi.exists() && fi.isFile() && fi.isExecutable(); } -bool CVSControl::supportsOperation(Operation operation) const +bool CvsControl::supportsOperation(Operation operation) const { bool rc = isConfigured(); switch (operation) { @@ -85,88 +85,88 @@ bool CVSControl::supportsOperation(Operation operation) const return rc; } -bool CVSControl::vcsOpen(const QString &fileName) +bool CvsControl::vcsOpen(const QString &fileName) { const QFileInfo fi(fileName); return m_plugin->edit(fi.absolutePath(), QStringList(fi.fileName())); } -bool CVSControl::vcsAdd(const QString &fileName) +bool CvsControl::vcsAdd(const QString &fileName) { const QFileInfo fi(fileName); return m_plugin->vcsAdd(fi.absolutePath(), fi.fileName()); } -bool CVSControl::vcsDelete(const QString &fileName) +bool CvsControl::vcsDelete(const QString &fileName) { const QFileInfo fi(fileName); return m_plugin->vcsDelete(fi.absolutePath(), fi.fileName()); } -bool CVSControl::vcsMove(const QString &from, const QString &to) +bool CvsControl::vcsMove(const QString &from, const QString &to) { Q_UNUSED(from); Q_UNUSED(to); return false; } -bool CVSControl::vcsCreateRepository(const QString &) +bool CvsControl::vcsCreateRepository(const QString &) { return false; } -QString CVSControl::vcsGetRepositoryURL(const QString &) +QString CvsControl::vcsGetRepositoryURL(const QString &) { return QString(); } -bool CVSControl::vcsCheckout(const QString &, const QByteArray &) +bool CvsControl::vcsCheckout(const QString &, const QByteArray &) { return false; } -QString CVSControl::vcsCreateSnapshot(const QString &) +QString CvsControl::vcsCreateSnapshot(const QString &) { return QString(); } -QStringList CVSControl::vcsSnapshots(const QString &) +QStringList CvsControl::vcsSnapshots(const QString &) { return QStringList(); } -bool CVSControl::vcsRestoreSnapshot(const QString &, const QString &) +bool CvsControl::vcsRestoreSnapshot(const QString &, const QString &) { return false; } -bool CVSControl::vcsRemoveSnapshot(const QString &, const QString &) +bool CvsControl::vcsRemoveSnapshot(const QString &, const QString &) { return false; } -bool CVSControl::vcsAnnotate(const QString &file, int line) +bool CvsControl::vcsAnnotate(const QString &file, int line) { m_plugin->vcsAnnotate(file, QString(), line); return true; } -bool CVSControl::managesDirectory(const QString &directory, QString *topLevel) const +bool CvsControl::managesDirectory(const QString &directory, QString *topLevel) const { return m_plugin->managesDirectory(directory, topLevel); } -void CVSControl::emitRepositoryChanged(const QString &s) +void CvsControl::emitRepositoryChanged(const QString &s) { emit repositoryChanged(s); } -void CVSControl::emitFilesChanged(const QStringList &l) +void CvsControl::emitFilesChanged(const QStringList &l) { emit filesChanged(l); } -void CVSControl::emitConfigurationChanged() +void CvsControl::emitConfigurationChanged() { emit configurationChanged(); } diff --git a/src/plugins/cvs/cvscontrol.h b/src/plugins/cvs/cvscontrol.h index 091867ca7f..7e45770887 100644 --- a/src/plugins/cvs/cvscontrol.h +++ b/src/plugins/cvs/cvscontrol.h @@ -35,18 +35,18 @@ #include -namespace CVS { +namespace Cvs { namespace Internal { -class CVSPlugin; +class CvsPlugin; // Just a proxy for CVSPlugin -class CVSControl : public Core::IVersionControl +class CvsControl : public Core::IVersionControl { Q_OBJECT public: - explicit CVSControl(CVSPlugin *plugin); + explicit CvsControl(CvsPlugin *plugin); QString displayName() const; Core::Id id() const; @@ -72,10 +72,10 @@ public: void emitConfigurationChanged(); private: - CVSPlugin *m_plugin; + CvsPlugin *m_plugin; }; } // namespace Internal -} // namespace CVS +} // namespace Cvs #endif // CVSCONTROL_H diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp index bbab07be37..aa83af072b 100644 --- a/src/plugins/cvs/cvseditor.cpp +++ b/src/plugins/cvs/cvseditor.cpp @@ -43,14 +43,14 @@ #include #include -namespace CVS { +namespace Cvs { namespace Internal { // Match a CVS revision ("1.1.1.1") #define CVS_REVISION_PATTERN "[\\d\\.]+" #define CVS_REVISION_AT_START_PATTERN "^(" CVS_REVISION_PATTERN ") " -CVSEditor::CVSEditor(const VcsBase::VcsBaseEditorParameters *type, +CvsEditor::CvsEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent) : VcsBase::VcsBaseEditorWidget(type, parent), m_revisionAnnotationPattern(QLatin1String(CVS_REVISION_AT_START_PATTERN".*$")), @@ -61,7 +61,7 @@ CVSEditor::CVSEditor(const VcsBase::VcsBaseEditorParameters *type, setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\"")); } -QSet CVSEditor::annotationChanges() const +QSet CvsEditor::annotationChanges() const { QSet changes; const QString txt = toPlainText(); @@ -80,12 +80,12 @@ QSet CVSEditor::annotationChanges() const changes.insert(r.cap(1)); } } - if (CVS::Constants::debug) + if (Cvs::Constants::debug) qDebug() << "CVSEditor::annotationChanges() returns #" << changes.size(); return changes; } -QString CVSEditor::changeUnderCursor(const QTextCursor &c) const +QString CvsEditor::changeUnderCursor(const QTextCursor &c) const { // Try to match "1.1" strictly: // 1) Annotation: Check for a revision number at the beginning of the line. @@ -124,19 +124,19 @@ cvs diff -d -u -r1.1 -r1.2: \endcode */ -VcsBase::DiffHighlighter *CVSEditor::createDiffHighlighter() const +VcsBase::DiffHighlighter *CvsEditor::createDiffHighlighter() const { const QRegExp filePattern(QLatin1String("^[-+][-+][-+] .*1\\.[\\d\\.]+$")); QTC_CHECK(filePattern.isValid()); return new VcsBase::DiffHighlighter(filePattern); } -VcsBase::BaseAnnotationHighlighter *CVSEditor::createAnnotationHighlighter(const QSet &changes) const +VcsBase::BaseAnnotationHighlighter *CvsEditor::createAnnotationHighlighter(const QSet &changes) const { - return new CVSAnnotationHighlighter(changes); + return new CvsAnnotationHighlighter(changes); } -QString CVSEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const +QString CvsEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const { // "+++ mainwindow.cpp<\t>13 Jul 2009 13:50:15 -0000 1.1" // Go back chunks @@ -154,7 +154,7 @@ QString CVSEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) cons return QString(); } -QStringList CVSEditor::annotationPreviousVersions(const QString &revision) const +QStringList CvsEditor::annotationPreviousVersions(const QString &revision) const { if (isFirstRevision(revision)) return QStringList(); diff --git a/src/plugins/cvs/cvseditor.h b/src/plugins/cvs/cvseditor.h index b758d1192b..25a37f4533 100644 --- a/src/plugins/cvs/cvseditor.h +++ b/src/plugins/cvs/cvseditor.h @@ -37,24 +37,24 @@ #include -namespace CVS { +namespace Cvs { namespace Internal { -class CVSEditor : public VcsBase::VcsBaseEditorWidget +class CvsEditor : public VcsBase::VcsBaseEditorWidget { Q_OBJECT public: - explicit CVSEditor(const VcsBase::VcsBaseEditorParameters *type, + explicit CvsEditor(const VcsBase::VcsBaseEditorParameters *type, QWidget *parent); private: - virtual QSet annotationChanges() const; - virtual QString changeUnderCursor(const QTextCursor &) const; - virtual VcsBase::DiffHighlighter *createDiffHighlighter() const; - virtual VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet &changes) const; - virtual QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const; - virtual QStringList annotationPreviousVersions(const QString &revision) const; + QSet annotationChanges() const; + QString changeUnderCursor(const QTextCursor &) const; + VcsBase::DiffHighlighter *createDiffHighlighter() const; + VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet &changes) const; + QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const; + QStringList annotationPreviousVersions(const QString &revision) const; const QRegExp m_revisionAnnotationPattern; const QRegExp m_revisionLogPattern; @@ -62,6 +62,6 @@ private: }; } // namespace Internal -} // namespace CVS +} // namespace Cvs #endif // CVSEDITOR_H diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 015df3425d..31ab9af265 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -74,18 +74,21 @@ #include #include -namespace CVS { +using namespace VcsBase; +using namespace Core; + +namespace Cvs { namespace Internal { static inline QString msgCannotFindTopLevel(const QString &f) { - return CVSPlugin::tr("Cannot find repository for '%1'"). + return CvsPlugin::tr("Cannot find repository for '%1'"). arg(QDir::toNativeSeparators(f)); } static inline QString msgLogParsingFailed() { - return CVSPlugin::tr("Parsing of the log output failed"); + return CvsPlugin::tr("Parsing of the log output failed"); } static const char CMD_ID_CVS_MENU[] = "CVS.Menu"; @@ -115,27 +118,27 @@ static const char CMD_ID_REPOSITORYSTATUS[] = "CVS.RepositoryStatus"; static const char CMD_ID_REPOSITORYUPDATE[] = "CVS.RepositoryUpdate"; static const char CMD_ID_SEPARATOR3[] = "CVS.Separator3"; -static const VcsBase::VcsBaseEditorParameters editorParameters[] = { +static const VcsBaseEditorParameters editorParameters[] = { { - VcsBase::RegularCommandOutput, + RegularCommandOutput, "CVS Command Log Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Command Log Editor"), // display name "CVS Command Log Editor", // context "application/vnd.nokia.text.scs_cvs_commandlog", "scslog"}, -{ VcsBase::LogOutput, +{ LogOutput, "CVS File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS File Log Editor"), // display name "CVS File Log Editor", // context "application/vnd.nokia.text.scs_cvs_filelog", "scsfilelog"}, -{ VcsBase::AnnotateOutput, +{ AnnotateOutput, "CVS Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Annotation Editor"), // display name "CVS Annotation Editor", // context "application/vnd.nokia.text.scs_cvs_annotation", "scsannotate"}, -{ VcsBase::DiffOutput, +{ DiffOutput, "CVS Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Diff Editor"), // display name "CVS Diff Editor", // context @@ -143,10 +146,10 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { }; // Utility to find a parameter set by type -static inline const VcsBase::VcsBaseEditorParameters *findType(int ie) +static inline const VcsBaseEditorParameters *findType(int ie) { - const VcsBase::EditorContentType et = static_cast(ie); - return VcsBase::VcsBaseEditorWidget::findType(editorParameters, sizeof(editorParameters)/sizeof(VcsBase::VcsBaseEditorParameters), et); + const EditorContentType et = static_cast(ie); + return VcsBaseEditorWidget::findType(editorParameters, sizeof(editorParameters)/sizeof(VcsBaseEditorParameters), et); } static inline QString debugCodec(const QTextCodec *c) @@ -160,10 +163,10 @@ static inline bool messageBoxQuestion(const QString &title, const QString &quest } // ------------- CVSPlugin -CVSPlugin *CVSPlugin::m_cvsPluginInstance = 0; +CvsPlugin *CvsPlugin::m_cvsPluginInstance = 0; -CVSPlugin::CVSPlugin() : - VcsBase::VcsBasePlugin(QLatin1String(CVS::Constants::CVSCOMMITEDITOR_ID)), +CvsPlugin::CvsPlugin() : + VcsBasePlugin(QLatin1String(Constants::CVSCOMMITEDITOR_ID)), m_commandLocator(0), m_addAction(0), m_deleteAction(0), @@ -195,12 +198,12 @@ CVSPlugin::CVSPlugin() : { } -CVSPlugin::~CVSPlugin() +CvsPlugin::~CvsPlugin() { cleanCommitMessageFile(); } -void CVSPlugin::cleanCommitMessageFile() +void CvsPlugin::cleanCommitMessageFile() { if (!m_commitMessageFileName.isEmpty()) { QFile::remove(m_commitMessageFileName); @@ -208,41 +211,42 @@ void CVSPlugin::cleanCommitMessageFile() m_commitRepository.clear(); } } -bool CVSPlugin::isCommitEditorOpen() const +bool CvsPlugin::isCommitEditorOpen() const { return !m_commitMessageFileName.isEmpty(); } -static const VcsBase::VcsBaseSubmitEditorParameters submitParameters = { - CVS::Constants::CVS_SUBMIT_MIMETYPE, - CVS::Constants::CVSCOMMITEDITOR_ID, - CVS::Constants::CVSCOMMITEDITOR_DISPLAY_NAME, - CVS::Constants::CVSCOMMITEDITOR +static const VcsBaseSubmitEditorParameters submitParameters = { + Constants::CVS_SUBMIT_MIMETYPE, + Constants::CVSCOMMITEDITOR_ID, + Constants::CVSCOMMITEDITOR_DISPLAY_NAME, + Constants::CVSCOMMITEDITOR }; -static inline Core::Command *createSeparator(QObject *parent, - Core::ActionManager *ami, - const char *id, - const Core::Context &globalcontext) +static Command *createSeparator(QObject *parent, + ActionManager *ami, + const char *id, + const Context &globalcontext) { QAction *tmpaction = new QAction(parent); tmpaction->setSeparator(true); return ami->registerAction(tmpaction, id, globalcontext); } -bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMessage) +bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage) { - typedef VcsBase::VcsSubmitEditorFactory CVSSubmitEditorFactory; - typedef VcsBase::VcsEditorFactory CVSEditorFactory; + Q_UNUSED(arguments); + typedef VcsSubmitEditorFactory CVSSubmitEditorFactory; + typedef VcsEditorFactory CVSEditorFactory; using namespace Constants; using namespace Core::Constants; using namespace ExtensionSystem; - initializeVcs(new CVSControl(this)); + initializeVcs(new CvsControl(this)); m_cvsPluginInstance = this; - Core::ICore *core = Core::ICore::instance(); + ICore *core = ICore::instance(); if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":/trolltech.cvs/CVS.mimetypes.xml"), errorMessage)) return false; @@ -255,7 +259,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes addAutoReleasedObject(new CVSSubmitEditorFactory(&submitParameters)); static const char *describeSlotC = SLOT(slotDescribe(QString,QString)); - const int editorCount = sizeof(editorParameters)/sizeof(VcsBase::VcsBaseEditorParameters); + const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]); for (int i = 0; i < editorCount; i++) addAutoReleasedObject(new CVSEditorFactory(editorParameters + i, this, describeSlotC)); @@ -265,23 +269,23 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_commandLocator = new Locator::CommandLocator(QLatin1String("CVS"), prefix, prefix); addAutoReleasedObject(m_commandLocator); - //register actions - Core::ActionManager *ami = core->actionManager(); - Core::ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS); + // Register actions + ActionManager *ami = core->actionManager(); + ActionContainer *toolsContainer = ami->actionContainer(M_TOOLS); - Core::ActionContainer *cvsMenu = ami->createMenu(Core::Id(CMD_ID_CVS_MENU)); + ActionContainer *cvsMenu = ami->createMenu(Id(CMD_ID_CVS_MENU)); cvsMenu->menu()->setTitle(tr("&CVS")); toolsContainer->addMenu(cvsMenu); m_menuAction = cvsMenu->menu()->menuAction(); - Core::Context globalcontext(C_GLOBAL); + Context globalcontext(C_GLOBAL); - Core::Command *command; + Command *command; m_diffCurrentAction = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_diffCurrentAction, CMD_ID_DIFF_CURRENT, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+D"))); connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile())); cvsMenu->addAction(command); @@ -290,7 +294,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_filelogCurrentAction = new Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_filelogCurrentAction, CMD_ID_FILELOG_CURRENT, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_filelogCurrentAction, SIGNAL(triggered()), this, SLOT(filelogCurrentFile())); cvsMenu->addAction(command); @@ -299,7 +303,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_annotateCurrentAction = new Utils::ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_annotateCurrentAction, CMD_ID_ANNOTATE_CURRENT, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_annotateCurrentAction, SIGNAL(triggered()), this, SLOT(annotateCurrentFile())); cvsMenu->addAction(command); @@ -310,7 +314,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_addAction, CMD_ID_ADD, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+A"))); connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile())); cvsMenu->addAction(command); @@ -319,7 +323,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_commitCurrentAction = new Utils::ParameterAction(tr("Commit Current File"), tr("Commit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_commitCurrentAction, CMD_ID_COMMIT_CURRENT, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+C"))); connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile())); cvsMenu->addAction(command); @@ -328,7 +332,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_deleteAction = new Utils::ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_deleteAction, CMD_ID_DELETE_FILE, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(promptToDeleteCurrentFile())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); @@ -336,7 +340,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_revertAction = new Utils::ParameterAction(tr("Revert..."), tr("Revert \"%1\"..."), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_revertAction, CMD_ID_REVERT, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_revertAction, SIGNAL(triggered()), this, SLOT(revertCurrentFile())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); @@ -345,14 +349,14 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_editCurrentAction = new Utils::ParameterAction(tr("Edit"), tr("Edit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_editCurrentAction, CMD_ID_EDIT_FILE, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_editCurrentAction, SIGNAL(triggered()), this, SLOT(editCurrentFile())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); m_uneditCurrentAction = new Utils::ParameterAction(tr("Unedit"), tr("Unedit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_uneditCurrentAction, CMD_ID_UNEDIT_FILE, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_uneditCurrentAction, SIGNAL(triggered()), this, SLOT(uneditCurrentFile())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); @@ -368,7 +372,7 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_diffProjectAction = new Utils::ParameterAction(tr("Diff Project"), tr("Diff Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffProject())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); @@ -376,28 +380,28 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_statusProjectAction = new Utils::ParameterAction(tr("Project Status"), tr("Status of Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_statusProjectAction, CMD_ID_STATUS, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_statusProjectAction, SIGNAL(triggered()), this, SLOT(projectStatus())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); m_logProjectAction = new Utils::ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_logProjectAction, CMD_ID_PROJECTLOG, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_logProjectAction, SIGNAL(triggered()), this, SLOT(logProject())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); m_updateProjectAction = new Utils::ParameterAction(tr("Update Project"), tr("Update Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_updateProjectAction, CMD_ID_UPDATE, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_updateProjectAction, SIGNAL(triggered()), this, SLOT(updateProject())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); m_commitProjectAction = new Utils::ParameterAction(tr("Commit Project"), tr("Commit Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = ami->registerAction(m_commitProjectAction, CMD_ID_PROJECTCOMMIT, globalcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_commitProjectAction, SIGNAL(triggered()), this, SLOT(commitProject())); cvsMenu->addAction(command); m_commandLocator->appendCommand(command); @@ -443,14 +447,14 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes m_commandLocator->appendCommand(command); // Actions of the submit editor - Core::Context cvscommitcontext(Constants::CVSCOMMITEDITOR); + Context cvscommitcontext(Constants::CVSCOMMITEDITOR); - m_submitCurrentLogAction = new QAction(VcsBase::VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this); + m_submitCurrentLogAction = new QAction(VcsBaseSubmitEditor::submitIcon(), tr("Commit"), this); command = ami->registerAction(m_submitCurrentLogAction, Constants::SUBMIT_CURRENT, cvscommitcontext); - command->setAttribute(Core::Command::CA_UpdateText); + command->setAttribute(Command::CA_UpdateText); connect(m_submitCurrentLogAction, SIGNAL(triggered()), this, SLOT(submitCurrentLog())); - m_submitDiffAction = new QAction(VcsBase::VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this); + m_submitDiffAction = new QAction(VcsBaseSubmitEditor::diffIcon(), tr("Diff &Selected Files"), this); command = ami->registerAction(m_submitDiffAction , Constants::DIFF_SELECTED, cvscommitcontext); m_submitUndoAction = new QAction(tr("&Undo"), this); @@ -461,13 +465,13 @@ bool CVSPlugin::initialize(const QStringList & /*arguments */, QString *errorMes return true; } -bool CVSPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEditor) +bool CvsPlugin::submitEditorAboutToClose(VcsBaseSubmitEditor *submitEditor) { if (!isCommitEditorOpen()) return true; - Core::IFile *fileIFace = submitEditor->file(); - const CVSSubmitEditor *editor = qobject_cast(submitEditor); + IFile *fileIFace = submitEditor->file(); + const CvsSubmitEditor *editor = qobject_cast(submitEditor); if (!fileIFace || !editor) return true; @@ -480,17 +484,17 @@ bool CVSPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEdi // Prompt user. Force a prompt unless submit was actually invoked (that // is, the editor was closed or shutdown). - CVSSettings newSettings = m_settings; - const VcsBase::VcsBaseSubmitEditor::PromptSubmitResult answer = + CvsSettings newSettings = m_settings; + const VcsBaseSubmitEditor::PromptSubmitResult answer = editor->promptSubmit(tr("Closing CVS Editor"), tr("Do you want to commit the change?"), tr("The commit message check failed. Do you want to commit the change?"), &newSettings.promptToSubmit, !m_submitActionTriggered); m_submitActionTriggered = false; switch (answer) { - case VcsBase::VcsBaseSubmitEditor::SubmitCanceled: + case VcsBaseSubmitEditor::SubmitCanceled: return false; // Keep editing and change file - case VcsBase::VcsBaseSubmitEditor::SubmitDiscarded: + case VcsBaseSubmitEditor::SubmitDiscarded: cleanCommitMessageFile(); return true; // Cancel all default: @@ -501,7 +505,7 @@ bool CVSPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEdi bool closeEditor = true; if (!fileList.empty()) { // get message & commit - closeEditor = Core::ICore::instance()->fileManager()->saveFile(fileIFace); + closeEditor = ICore::instance()->fileManager()->saveFile(fileIFace); if (closeEditor) closeEditor = commit(m_commitMessageFileName, fileList); } @@ -510,14 +514,14 @@ bool CVSPlugin::submitEditorAboutToClose(VcsBase::VcsBaseSubmitEditor *submitEdi return closeEditor; } -void CVSPlugin::diffCommitFiles(const QStringList &files) +void CvsPlugin::diffCommitFiles(const QStringList &files) { cvsDiff(m_commitRepository, files); } -static inline void setDiffBaseDirectory(Core::IEditor *editor, const QString &db) +static void setDiffBaseDirectory(IEditor *editor, const QString &db) { - if (VcsBase::VcsBaseEditorWidget *ve = qobject_cast(editor->widget())) + if (VcsBaseEditorWidget *ve = qobject_cast(editor->widget())) ve->setDiffBaseDirectory(db); } @@ -532,14 +536,15 @@ struct CvsDiffParameters // Parameter widget controlling whitespace diff mode, associated with a parameter // struct. -class CvsDiffParameterWidget : public VcsBase::VcsBaseEditorParameterWidget +class CvsDiffParameterWidget : public VcsBaseEditorParameterWidget { Q_OBJECT + public: explicit CvsDiffParameterWidget(const CvsDiffParameters &p, QWidget *parent = 0); signals: - void reRunDiff(const CVS::Internal::CvsDiffParameters &); + void reRunDiff(const Cvs::Internal::CvsDiffParameters &); public slots: void triggerReRun(); @@ -549,7 +554,7 @@ private: }; CvsDiffParameterWidget::CvsDiffParameterWidget(const CvsDiffParameters &p, QWidget *parent) : - VcsBase::VcsBaseEditorParameterWidget(parent), m_parameters(p) + VcsBaseEditorParameterWidget(parent), m_parameters(p) { setBaseArguments(p.arguments); addToggleButton(QLatin1String("-w"), tr("Ignore whitespace")); @@ -565,7 +570,7 @@ void CvsDiffParameterWidget::triggerReRun() emit reRunDiff(effectiveParameters); } -void CVSPlugin::cvsDiff(const QString &workingDir, const QStringList &files) +void CvsPlugin::cvsDiff(const QString &workingDir, const QStringList &files) { CvsDiffParameters p; p.workingDir = workingDir; @@ -574,13 +579,13 @@ void CVSPlugin::cvsDiff(const QString &workingDir, const QStringList &files) cvsDiff(p); } -void CVSPlugin::cvsDiff(const CvsDiffParameters &p) +void CvsPlugin::cvsDiff(const CvsDiffParameters &p) { - if (CVS::Constants::debug) + if (Cvs::Constants::debug) qDebug() << Q_FUNC_INFO << p.files; - const QString source = VcsBase::VcsBaseEditorWidget::getSource(p.workingDir, p.files); - QTextCodec *codec = VcsBase::VcsBaseEditorWidget::getCodec(p.workingDir, p.files); - const QString id = VcsBase::VcsBaseEditorWidget::getTitleId(p.workingDir, p.files); + const QString source = VcsBaseEditorWidget::getSource(p.workingDir, p.files); + QTextCodec *codec = VcsBaseEditorWidget::getCodec(p.workingDir, p.files); + const QString id = VcsBaseEditorWidget::getTitleId(p.workingDir, p.files); QStringList args(QLatin1String("diff")); args.append(p.arguments); @@ -588,13 +593,13 @@ void CVSPlugin::cvsDiff(const CvsDiffParameters &p) // CVS returns the diff exit code (1 if files differ), which is // undistinguishable from a "file not found" error, unfortunately. - const CVSResponse response = - runCVS(p.workingDir, args, m_settings.timeOutMS(), 0, codec); + const CvsResponse response = + runCvs(p.workingDir, args, m_settings.timeOutMS(), 0, codec); switch (response.result) { - case CVSResponse::NonNullExitCode: - case CVSResponse::Ok: + case CvsResponse::NonNullExitCode: + case CvsResponse::Ok: break; - case CVSResponse::OtherError: + case CvsResponse::OtherError: return; } @@ -604,36 +609,36 @@ void CVSPlugin::cvsDiff(const CvsDiffParameters &p) // diff of a single file? re-use an existing view if possible to support // the common usage pattern of continuously changing and diffing a file // Show in the same editor if diff has been executed before - const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::DiffOutput, p.workingDir, p.files); - if (Core::IEditor *existingEditor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) { + const QString tag = VcsBaseEditorWidget::editorTag(DiffOutput, p.workingDir, p.files); + if (IEditor *existingEditor = VcsBaseEditorWidget::locateEditorByTag(tag)) { existingEditor->createNew(output); - Core::EditorManager::instance()->activateEditor(existingEditor, Core::EditorManager::ModeSwitch); + EditorManager::instance()->activateEditor(existingEditor, EditorManager::ModeSwitch); setDiffBaseDirectory(existingEditor, p.workingDir); return; } const QString title = QString::fromLatin1("cvs diff %1").arg(id); - Core::IEditor *editor = showOutputInEditor(title, output, VcsBase::DiffOutput, source, codec); - VcsBase::VcsBaseEditorWidget::tagEditor(editor, tag); + IEditor *editor = showOutputInEditor(title, output, DiffOutput, source, codec); + VcsBaseEditorWidget::tagEditor(editor, tag); setDiffBaseDirectory(editor, p.workingDir); - CVSEditor *diffEditorWidget = qobject_cast(editor->widget()); + CvsEditor *diffEditorWidget = qobject_cast(editor->widget()); QTC_ASSERT(diffEditorWidget, return ; ) // Wire up the parameter widget to trigger a re-run on // parameter change and 'revert' from inside the diff editor. diffEditorWidget->setRevertDiffChunkEnabled(true); CvsDiffParameterWidget *pw = new CvsDiffParameterWidget(p); - connect(pw, SIGNAL(reRunDiff(CVS::Internal::CvsDiffParameters)), - this, SLOT(cvsDiff(CVS::Internal::CvsDiffParameters))); + connect(pw, SIGNAL(reRunDiff(Cvs::Internal::CvsDiffParameters)), + this, SLOT(cvsDiff(Cvs::Internal::CvsDiffParameters))); connect(diffEditorWidget, SIGNAL(diffChunkReverted(VcsBase::DiffChunk)), pw, SLOT(triggerReRun())); diffEditorWidget->setConfigurationWidget(pw); } -CVSSubmitEditor *CVSPlugin::openCVSSubmitEditor(const QString &fileName) +CvsSubmitEditor *CvsPlugin::openCVSSubmitEditor(const QString &fileName) { - Core::IEditor *editor = Core::EditorManager::instance()->openEditor(fileName, Constants::CVSCOMMITEDITOR_ID, - Core::EditorManager::ModeSwitch); - CVSSubmitEditor *submitEditor = qobject_cast(editor); + IEditor *editor = EditorManager::instance()->openEditor(fileName, Constants::CVSCOMMITEDITOR_ID, + EditorManager::ModeSwitch); + CvsSubmitEditor *submitEditor = qobject_cast(editor); QTC_CHECK(submitEditor); submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction); connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList))); @@ -641,7 +646,7 @@ CVSSubmitEditor *CVSPlugin::openCVSSubmitEditor(const QString &fileName) return submitEditor; } -void CVSPlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as) +void CvsPlugin::updateActions(VcsBasePlugin::ActionState as) { if (!enableMenuAction(as, m_menuAction)) { m_commandLocator->setEnabled(false); @@ -677,48 +682,48 @@ void CVSPlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as) m_uneditRepositoryAction->setEnabled(hasTopLevel); } -void CVSPlugin::addCurrentFile() +void CvsPlugin::addCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) vcsAdd(state.currentFileTopLevel(), state.relativeCurrentFile()); } -void CVSPlugin::revertAll() +void CvsPlugin::revertAll() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) const QString title = tr("Revert repository"); if (!messageBoxQuestion(title, tr("Revert all pending changes to the repository?"))) return; QStringList args; args << QLatin1String("update") << QLatin1String("-C") << state.topLevel(); - const CVSResponse revertResponse = - runCVS(state.topLevel(), args, m_settings.timeOutMS(), + const CvsResponse revertResponse = + runCvs(state.topLevel(), args, m_settings.timeOutMS(), SshPasswordPrompt|ShowStdOutInLogWindow); - if (revertResponse.result == CVSResponse::Ok) { + if (revertResponse.result == CvsResponse::Ok) { cvsVersionControl()->emitRepositoryChanged(state.topLevel()); } else { QMessageBox::warning(0, title, tr("Revert failed: %1").arg(revertResponse.message), QMessageBox::Ok); } } -void CVSPlugin::revertCurrentFile() +void CvsPlugin::revertCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) QStringList args; args << QLatin1String("diff") << state.relativeCurrentFile(); - const CVSResponse diffResponse = - runCVS(state.currentFileTopLevel(), args, m_settings.timeOutMS(), 0); + const CvsResponse diffResponse = + runCvs(state.currentFileTopLevel(), args, m_settings.timeOutMS(), 0); switch (diffResponse.result) { - case CVSResponse::Ok: + case CvsResponse::Ok: return; // Not modified, diff exit code 0 - case CVSResponse::NonNullExitCode: // Diff exit code != 0 + case CvsResponse::NonNullExitCode: // Diff exit code != 0 if (diffResponse.stdOut.isEmpty()) // Paranoia: Something else failed? return; break; - case CVSResponse::OtherError: + case CvsResponse::OtherError: return; } @@ -726,43 +731,43 @@ void CVSPlugin::revertCurrentFile() tr("The file has been changed. Do you want to revert it?"))) return; - Core::FileChangeBlocker fcb(state.currentFile()); + FileChangeBlocker fcb(state.currentFile()); // revert args.clear(); args << QLatin1String("update") << QLatin1String("-C") << state.relativeCurrentFile(); - const CVSResponse revertResponse = - runCVS(state.currentFileTopLevel(), args, m_settings.timeOutMS(), + const CvsResponse revertResponse = + runCvs(state.currentFileTopLevel(), args, m_settings.timeOutMS(), SshPasswordPrompt|ShowStdOutInLogWindow); - if (revertResponse.result == CVSResponse::Ok) { + if (revertResponse.result == CvsResponse::Ok) { cvsVersionControl()->emitFilesChanged(QStringList(state.currentFile())); } } -void CVSPlugin::diffProject() +void CvsPlugin::diffProject() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasProject(), return) cvsDiff(state.currentProjectTopLevel(), state.relativeCurrentProject()); } -void CVSPlugin::diffCurrentFile() +void CvsPlugin::diffCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) cvsDiff(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); } -void CVSPlugin::startCommitCurrentFile() +void CvsPlugin::startCommitCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) startCommit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); } -void CVSPlugin::startCommitAll() +void CvsPlugin::startCommitAll() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) startCommit(state.topLevel()); } @@ -770,21 +775,21 @@ void CVSPlugin::startCommitAll() /* Start commit of files of a single repository by displaying * template and files in a submit editor. On closing, the real * commit will start. */ -void CVSPlugin::startCommit(const QString &workingDir, const QStringList &files) +void CvsPlugin::startCommit(const QString &workingDir, const QStringList &files) { - if (VcsBase::VcsBaseSubmitEditor::raiseSubmitEditor()) + if (VcsBaseSubmitEditor::raiseSubmitEditor()) return; if (isCommitEditorOpen()) { - VcsBase::VcsBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed.")); + VcsBaseOutputWindow::instance()->appendWarning(tr("Another commit is currently being executed.")); return; } // We need the "Examining " stderr output to tell // where we are, so, have stdout/stderr channels merged. QStringList args = QStringList(QLatin1String("status")); - const CVSResponse response = - runCVS(workingDir, args, m_settings.timeOutMS(), MergeOutputChannels); - if (response.result != CVSResponse::Ok) + const CvsResponse response = + runCvs(workingDir, args, m_settings.timeOutMS(), MergeOutputChannels); + if (response.result != CvsResponse::Ok) return; // Get list of added/modified/deleted files and purge out undesired ones // (do not run status with relative arguments as it will omit the directories) @@ -799,7 +804,7 @@ void CVSPlugin::startCommit(const QString &workingDir, const QStringList &files) } } if (statusOutput.empty()) { - VcsBase::VcsBaseOutputWindow::instance()->append(tr("There are no modified files.")); + VcsBaseOutputWindow::instance()->append(tr("There are no modified files.")); return; } m_commitRepository = workingDir; @@ -812,163 +817,163 @@ void CVSPlugin::startCommit(const QString &workingDir, const QStringList &files) // Create a submit saver.write(submitTemplate.toUtf8()); if (!saver.finalize()) { - VcsBase::VcsBaseOutputWindow::instance()->appendError(saver.errorString()); + VcsBaseOutputWindow::instance()->appendError(saver.errorString()); return; } m_commitMessageFileName = saver.fileName(); // Create a submit editor and set file list - CVSSubmitEditor *editor = openCVSSubmitEditor(m_commitMessageFileName); + CvsSubmitEditor *editor = openCVSSubmitEditor(m_commitMessageFileName); editor->setCheckScriptWorkingDirectory(m_commitRepository); editor->setStateList(statusOutput); } -bool CVSPlugin::commit(const QString &messageFile, +bool CvsPlugin::commit(const QString &messageFile, const QStringList &fileList) { - if (CVS::Constants::debug) + if (Cvs::Constants::debug) qDebug() << Q_FUNC_INFO << messageFile << fileList; QStringList args = QStringList(QLatin1String("commit")); args << QLatin1String("-F") << messageFile; args.append(fileList); - const CVSResponse response = - runCVS(m_commitRepository, args, m_settings.longTimeOutMS(), + const CvsResponse response = + runCvs(m_commitRepository, args, m_settings.longTimeOutMS(), SshPasswordPrompt|ShowStdOutInLogWindow); - return response.result == CVSResponse::Ok ; + return response.result == CvsResponse::Ok ; } -void CVSPlugin::filelogCurrentFile() +void CvsPlugin::filelogCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) filelog(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile()), true); } -void CVSPlugin::logProject() +void CvsPlugin::logProject() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasProject(), return) filelog(state.currentProjectTopLevel(), state.relativeCurrentProject()); } -void CVSPlugin::logRepository() +void CvsPlugin::logRepository() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) filelog(state.topLevel()); } -void CVSPlugin::filelog(const QString &workingDir, +void CvsPlugin::filelog(const QString &workingDir, const QStringList &files, bool enableAnnotationContextMenu) { - QTextCodec *codec = VcsBase::VcsBaseEditorWidget::getCodec(workingDir, files); + QTextCodec *codec = VcsBaseEditorWidget::getCodec(workingDir, files); // no need for temp file - const QString id = VcsBase::VcsBaseEditorWidget::getTitleId(workingDir, files); - const QString source = VcsBase::VcsBaseEditorWidget::getSource(workingDir, files); + const QString id = VcsBaseEditorWidget::getTitleId(workingDir, files); + const QString source = VcsBaseEditorWidget::getSource(workingDir, files); QStringList args; args << QLatin1String("log"); args.append(files); - const CVSResponse response = - runCVS(workingDir, args, m_settings.timeOutMS(), + const CvsResponse response = + runCvs(workingDir, args, m_settings.timeOutMS(), SshPasswordPrompt, codec); - if (response.result != CVSResponse::Ok) + if (response.result != CvsResponse::Ok) return; // Re-use an existing view if possible to support // the common usage pattern of continuously changing and diffing a file - const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::LogOutput, workingDir, files); - if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) { + const QString tag = VcsBaseEditorWidget::editorTag(LogOutput, workingDir, files); + if (Core::IEditor *editor = VcsBaseEditorWidget::locateEditorByTag(tag)) { editor->createNew(response.stdOut); Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch); } else { const QString title = QString::fromLatin1("cvs log %1").arg(id); - Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VcsBase::LogOutput, source, codec); - VcsBase::VcsBaseEditorWidget::tagEditor(newEditor, tag); + Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, LogOutput, source, codec); + VcsBaseEditorWidget::tagEditor(newEditor, tag); if (enableAnnotationContextMenu) - VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(newEditor)->setFileLogAnnotateEnabled(true); + VcsBaseEditorWidget::getVcsBaseEditor(newEditor)->setFileLogAnnotateEnabled(true); } } -void CVSPlugin::updateProject() +void CvsPlugin::updateProject() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasProject(), return) update(state.currentProjectTopLevel(), state.relativeCurrentProject()); } -bool CVSPlugin::update(const QString &topLevel, const QStringList &files) +bool CvsPlugin::update(const QString &topLevel, const QStringList &files) { QStringList args(QLatin1String("update")); args.push_back(QLatin1String("-dR")); args.append(files); - const CVSResponse response = - runCVS(topLevel, args, m_settings.longTimeOutMS(), + const CvsResponse response = + runCvs(topLevel, args, m_settings.longTimeOutMS(), SshPasswordPrompt|ShowStdOutInLogWindow); - const bool ok = response.result == CVSResponse::Ok; + const bool ok = response.result == CvsResponse::Ok; if (ok) cvsVersionControl()->emitRepositoryChanged(topLevel); return ok; } -void CVSPlugin::editCurrentFile() +void CvsPlugin::editCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) edit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); } -void CVSPlugin::uneditCurrentFile() +void CvsPlugin::uneditCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) unedit(state.currentFileTopLevel(), QStringList(state.relativeCurrentFile())); } -void CVSPlugin::uneditCurrentRepository() +void CvsPlugin::uneditCurrentRepository() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) unedit(state.topLevel(), QStringList()); } -void CVSPlugin::annotateCurrentFile() +void CvsPlugin::annotateCurrentFile() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasFile(), return) annotate(state.currentFileTopLevel(), state.relativeCurrentFile()); } -void CVSPlugin::vcsAnnotate(const QString &file, const QString &revision, int lineNumber) +void CvsPlugin::vcsAnnotate(const QString &file, const QString &revision, int lineNumber) { const QFileInfo fi(file); annotate(fi.absolutePath(), fi.fileName(), revision, lineNumber); } -bool CVSPlugin::edit(const QString &topLevel, const QStringList &files) +bool CvsPlugin::edit(const QString &topLevel, const QStringList &files) { QStringList args(QLatin1String("edit")); args.append(files); - const CVSResponse response = - runCVS(topLevel, args, m_settings.timeOutMS(), + const CvsResponse response = + runCvs(topLevel, args, m_settings.timeOutMS(), ShowStdOutInLogWindow|SshPasswordPrompt); - return response.result == CVSResponse::Ok; + return response.result == CvsResponse::Ok; } -bool CVSPlugin::diffCheckModified(const QString &topLevel, const QStringList &files, bool *modified) +bool CvsPlugin::diffCheckModified(const QString &topLevel, const QStringList &files, bool *modified) { // Quick check for modified files using diff *modified = false; QStringList args(QLatin1String("-q")); args << QLatin1String("diff"); args.append(files); - const CVSResponse response = runCVS(topLevel, args, m_settings.timeOutMS(), 0); - if (response.result == CVSResponse::OtherError) + const CvsResponse response = runCvs(topLevel, args, m_settings.timeOutMS(), 0); + if (response.result == CvsResponse::OtherError) return false; - *modified = response.result == CVSResponse::NonNullExitCode; + *modified = response.result == CvsResponse::NonNullExitCode; return true; } -bool CVSPlugin::unedit(const QString &topLevel, const QStringList &files) +bool CvsPlugin::unedit(const QString &topLevel, const QStringList &files) { bool modified; // Prompt and use force flag if modified @@ -988,105 +993,105 @@ bool CVSPlugin::unedit(const QString &topLevel, const QStringList &files) if (modified) args.append(QLatin1String("-y")); args.append(files); - const CVSResponse response = - runCVS(topLevel, args, m_settings.timeOutMS(), + const CvsResponse response = + runCvs(topLevel, args, m_settings.timeOutMS(), ShowStdOutInLogWindow|SshPasswordPrompt); - return response.result == CVSResponse::Ok; + return response.result == CvsResponse::Ok; } -void CVSPlugin::annotate(const QString &workingDir, const QString &file, +void CvsPlugin::annotate(const QString &workingDir, const QString &file, const QString &revision /* = QString() */, int lineNumber /* = -1 */) { const QStringList files(file); - QTextCodec *codec = VcsBase::VcsBaseEditorWidget::getCodec(workingDir, files); - const QString id = VcsBase::VcsBaseEditorWidget::getTitleId(workingDir, files, revision); - const QString source = VcsBase::VcsBaseEditorWidget::getSource(workingDir, file); + QTextCodec *codec = VcsBaseEditorWidget::getCodec(workingDir, files); + const QString id = VcsBaseEditorWidget::getTitleId(workingDir, files, revision); + const QString source = VcsBaseEditorWidget::getSource(workingDir, file); QStringList args; args << QLatin1String("annotate"); if (!revision.isEmpty()) args << QLatin1String("-r") << revision; args << file; - const CVSResponse response = - runCVS(workingDir, args, m_settings.timeOutMS(), + const CvsResponse response = + runCvs(workingDir, args, m_settings.timeOutMS(), SshPasswordPrompt, codec); - if (response.result != CVSResponse::Ok) + if (response.result != CvsResponse::Ok) return; // Re-use an existing view if possible to support // the common usage pattern of continuously changing and diffing a file if (lineNumber < 1) - lineNumber = VcsBase::VcsBaseEditorWidget::lineNumberOfCurrentEditor(file); + lineNumber = VcsBaseEditorWidget::lineNumberOfCurrentEditor(file); - const QString tag = VcsBase::VcsBaseEditorWidget::editorTag(VcsBase::AnnotateOutput, workingDir, QStringList(file), revision); - if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(tag)) { + const QString tag = VcsBaseEditorWidget::editorTag(AnnotateOutput, workingDir, QStringList(file), revision); + if (IEditor *editor = VcsBaseEditorWidget::locateEditorByTag(tag)) { editor->createNew(response.stdOut); - VcsBase::VcsBaseEditorWidget::gotoLineOfEditor(editor, lineNumber); - Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch); + VcsBaseEditorWidget::gotoLineOfEditor(editor, lineNumber); + EditorManager::instance()->activateEditor(editor, EditorManager::ModeSwitch); } else { const QString title = QString::fromLatin1("cvs annotate %1").arg(id); - Core::IEditor *newEditor = showOutputInEditor(title, response.stdOut, VcsBase::AnnotateOutput, source, codec); - VcsBase::VcsBaseEditorWidget::tagEditor(newEditor, tag); - VcsBase::VcsBaseEditorWidget::gotoLineOfEditor(newEditor, lineNumber); + IEditor *newEditor = showOutputInEditor(title, response.stdOut, AnnotateOutput, source, codec); + VcsBaseEditorWidget::tagEditor(newEditor, tag); + VcsBaseEditorWidget::gotoLineOfEditor(newEditor, lineNumber); } } -bool CVSPlugin::status(const QString &topLevel, const QStringList &files, const QString &title) +bool CvsPlugin::status(const QString &topLevel, const QStringList &files, const QString &title) { QStringList args(QLatin1String("status")); args.append(files); - const CVSResponse response = - runCVS(topLevel, args, m_settings.timeOutMS(), 0); - const bool ok = response.result == CVSResponse::Ok; + const CvsResponse response = + runCvs(topLevel, args, m_settings.timeOutMS(), 0); + const bool ok = response.result == CvsResponse::Ok; if (ok) - showOutputInEditor(title, response.stdOut, VcsBase::RegularCommandOutput, topLevel, 0); + showOutputInEditor(title, response.stdOut, RegularCommandOutput, topLevel, 0); return ok; } -void CVSPlugin::projectStatus() +void CvsPlugin::projectStatus() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasProject(), return) status(state.currentProjectTopLevel(), state.relativeCurrentProject(), tr("Project status")); } -void CVSPlugin::commitProject() +void CvsPlugin::commitProject() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasProject(), return) startCommit(state.currentProjectTopLevel(), state.relativeCurrentProject()); } -void CVSPlugin::diffRepository() +void CvsPlugin::diffRepository() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) cvsDiff(state.topLevel(), QStringList()); } -void CVSPlugin::statusRepository() +void CvsPlugin::statusRepository() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) status(state.topLevel(), QStringList(), tr("Repository status")); } -void CVSPlugin::updateRepository() +void CvsPlugin::updateRepository() { - const VcsBase::VcsBasePluginState state = currentState(); + const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return) update(state.topLevel(), QStringList()); } -void CVSPlugin::slotDescribe(const QString &source, const QString &changeNr) +void CvsPlugin::slotDescribe(const QString &source, const QString &changeNr) { QString errorMessage; if (!describe(source, changeNr, &errorMessage)) - VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage); + VcsBaseOutputWindow::instance()->appendError(errorMessage); } -bool CVSPlugin::describe(const QString &file, const QString &changeNr, QString *errorMessage) +bool CvsPlugin::describe(const QString &file, const QString &changeNr, QString *errorMessage) { QString toplevel; @@ -1098,7 +1103,7 @@ bool CVSPlugin::describe(const QString &file, const QString &changeNr, QString * return describe(toplevel, QDir(toplevel).relativeFilePath(file), changeNr, errorMessage); } -bool CVSPlugin::describe(const QString &toplevel, const QString &file, const +bool CvsPlugin::describe(const QString &toplevel, const QString &file, const QString &changeNr, QString *errorMessage) { @@ -1108,7 +1113,7 @@ bool CVSPlugin::describe(const QString &toplevel, const QString &file, const // This function makes use of it to find all files related to // a commit in order to emulate a "describe global change" functionality // if desired. - if (CVS::Constants::debug) + if (Cvs::Constants::debug) qDebug() << Q_FUNC_INFO << file << changeNr; // Number must be > 1 if (isFirstRevision(changeNr)) { @@ -1118,13 +1123,13 @@ bool CVSPlugin::describe(const QString &toplevel, const QString &file, const // Run log to obtain commit id and details QStringList args; args << QLatin1String("log") << (QLatin1String("-r") + changeNr) << file; - const CVSResponse logResponse = - runCVS(toplevel, args, m_settings.timeOutMS(), SshPasswordPrompt); - if (logResponse.result != CVSResponse::Ok) { + const CvsResponse logResponse = + runCvs(toplevel, args, m_settings.timeOutMS(), SshPasswordPrompt); + if (logResponse.result != CvsResponse::Ok) { *errorMessage = logResponse.message; return false; } - const QList fileLog = parseLogEntries(logResponse.stdOut); + const QList fileLog = parseLogEntries(logResponse.stdOut); if (fileLog.empty() || fileLog.front().revisions.empty()) { *errorMessage = msgLogParsingFailed(); return false; @@ -1140,14 +1145,14 @@ bool CVSPlugin::describe(const QString &toplevel, const QString &file, const args.clear(); args << QLatin1String("log") << QLatin1String("-d") << (dateS + QLatin1Char('<') + nextDayS); - const CVSResponse repoLogResponse = - runCVS(toplevel, args, m_settings.longTimeOutMS(), SshPasswordPrompt); - if (repoLogResponse.result != CVSResponse::Ok) { + const CvsResponse repoLogResponse = + runCvs(toplevel, args, m_settings.longTimeOutMS(), SshPasswordPrompt); + if (repoLogResponse.result != CvsResponse::Ok) { *errorMessage = repoLogResponse.message; return false; } // Describe all files found, pass on dir to obtain correct absolute paths. - const QList repoEntries = parseLogEntries(repoLogResponse.stdOut, QString(), commitId); + const QList repoEntries = parseLogEntries(repoLogResponse.stdOut, QString(), commitId); if (repoEntries.empty()) { *errorMessage = tr("Could not find commits of id '%1' on %2.").arg(commitId, dateS); return false; @@ -1162,31 +1167,31 @@ bool CVSPlugin::describe(const QString &toplevel, const QString &file, const // Describe a set of files and revisions by // concatenating log and diffs to previous revisions -bool CVSPlugin::describe(const QString &repositoryPath, - QList entries, +bool CvsPlugin::describe(const QString &repositoryPath, + QList entries, QString *errorMessage) { // Collect logs QString output; QTextCodec *codec = 0; - const QList::iterator lend = entries.end(); - for (QList::iterator it = entries.begin(); it != lend; ++it) { + const QList::iterator lend = entries.end(); + for (QList::iterator it = entries.begin(); it != lend; ++it) { // Before fiddling file names, try to find codec if (!codec) - codec = VcsBase::VcsBaseEditorWidget::getCodec(repositoryPath, QStringList(it->file)); + codec = VcsBaseEditorWidget::getCodec(repositoryPath, QStringList(it->file)); // Run log QStringList args(QLatin1String("log")); args << (QLatin1String("-r") + it->revisions.front().revision) << it->file; - const CVSResponse logResponse = - runCVS(repositoryPath, args, m_settings.timeOutMS(), SshPasswordPrompt); - if (logResponse.result != CVSResponse::Ok) { + const CvsResponse logResponse = + runCvs(repositoryPath, args, m_settings.timeOutMS(), SshPasswordPrompt); + if (logResponse.result != CvsResponse::Ok) { *errorMessage = logResponse.message; return false; } output += logResponse.stdOut; } // Collect diffs relative to repository - for (QList::iterator it = entries.begin(); it != lend; ++it) { + for (QList::iterator it = entries.begin(); it != lend; ++it) { const QString &revision = it->revisions.front().revision; if (!isFirstRevision(revision)) { const QString previousRev = previousRevision(revision); @@ -1194,17 +1199,17 @@ bool CVSPlugin::describe(const QString &repositoryPath, args << m_settings.cvsDiffOptions << QLatin1String("-r") << previousRev << QLatin1String("-r") << it->revisions.front().revision << it->file; - const CVSResponse diffResponse = - runCVS(repositoryPath, args, m_settings.timeOutMS(), 0, codec); + const CvsResponse diffResponse = + runCvs(repositoryPath, args, m_settings.timeOutMS(), 0, codec); switch (diffResponse.result) { - case CVSResponse::Ok: - case CVSResponse::NonNullExitCode: // Diff exit code != 0 + case CvsResponse::Ok: + case CvsResponse::NonNullExitCode: // Diff exit code != 0 if (diffResponse.stdOut.isEmpty()) { *errorMessage = diffResponse.message; return false; // Something else failed. } break; - case CVSResponse::OtherError: + case CvsResponse::OtherError: *errorMessage = diffResponse.message; return false; } @@ -1215,38 +1220,38 @@ bool CVSPlugin::describe(const QString &repositoryPath, // Re-use an existing view if possible to support // the common usage pattern of continuously changing and diffing a file const QString commitId = entries.front().revisions.front().commitId; - if (Core::IEditor *editor = VcsBase::VcsBaseEditorWidget::locateEditorByTag(commitId)) { + if (IEditor *editor = VcsBaseEditorWidget::locateEditorByTag(commitId)) { editor->createNew(output); - Core::EditorManager::instance()->activateEditor(editor, Core::EditorManager::ModeSwitch); + EditorManager::instance()->activateEditor(editor, EditorManager::ModeSwitch); setDiffBaseDirectory(editor, repositoryPath); } else { const QString title = QString::fromLatin1("cvs describe %1").arg(commitId); - Core::IEditor *newEditor = showOutputInEditor(title, output, VcsBase::DiffOutput, entries.front().file, codec); - VcsBase::VcsBaseEditorWidget::tagEditor(newEditor, commitId); + IEditor *newEditor = showOutputInEditor(title, output, DiffOutput, entries.front().file, codec); + VcsBaseEditorWidget::tagEditor(newEditor, commitId); setDiffBaseDirectory(newEditor, repositoryPath); } return true; } -void CVSPlugin::submitCurrentLog() +void CvsPlugin::submitCurrentLog() { m_submitActionTriggered = true; - Core::EditorManager::instance()->closeEditors(QList() - << Core::EditorManager::instance()->currentEditor()); + EditorManager::instance()->closeEditors(QList() + << EditorManager::instance()->currentEditor()); } // Run CVS. At this point, file arguments must be relative to // the working directory (see above). -CVSResponse CVSPlugin::runCVS(const QString &workingDirectory, +CvsResponse CvsPlugin::runCvs(const QString &workingDirectory, const QStringList &arguments, int timeOut, unsigned flags, QTextCodec *outputCodec) { const QString executable = m_settings.cvsCommand; - CVSResponse response; + CvsResponse response; if (executable.isEmpty()) { - response.result = CVSResponse::OtherError; + response.result = CvsResponse::OtherError; response.message =tr("No cvs executable specified!"); return response; } @@ -1256,15 +1261,15 @@ CVSResponse CVSPlugin::runCVS(const QString &workingDirectory, m_settings.addOptions(arguments), timeOut, flags, outputCodec); - response.result = CVSResponse::OtherError; + response.result = CvsResponse::OtherError; response.stdErr = sp_resp.stdErr; response.stdOut = sp_resp.stdOut; switch (sp_resp.result) { case Utils::SynchronousProcessResponse::Finished: - response.result = CVSResponse::Ok; + response.result = CvsResponse::Ok; break; case Utils::SynchronousProcessResponse::FinishedError: - response.result = CVSResponse::NonNullExitCode; + response.result = CvsResponse::NonNullExitCode; break; case Utils::SynchronousProcessResponse::TerminatedAbnormally: case Utils::SynchronousProcessResponse::StartFailed: @@ -1272,27 +1277,27 @@ CVSResponse CVSPlugin::runCVS(const QString &workingDirectory, break; } - if (response.result != CVSResponse::Ok) + if (response.result != CvsResponse::Ok) response.message = sp_resp.exitMessage(executable, timeOut); return response; } -Core::IEditor * CVSPlugin::showOutputInEditor(const QString& title, const QString &output, - int editorType, const QString &source, - QTextCodec *codec) +IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &output, + int editorType, const QString &source, + QTextCodec *codec) { - const VcsBase::VcsBaseEditorParameters *params = findType(editorType); + const VcsBaseEditorParameters *params = findType(editorType); QTC_ASSERT(params, return 0); - const Core::Id id = params->id; - if (CVS::Constants::debug) + const Id id = params->id; + if (Cvs::Constants::debug) qDebug() << "CVSPlugin::showOutputInEditor" << title << id.name() << "source=" << source << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); QString s = title; - Core::IEditor *editor = Core::EditorManager::instance()->openEditorWithContents(id, &s, output.toLocal8Bit()); + IEditor *editor = EditorManager::instance()->openEditorWithContents(id, &s, output.toLocal8Bit()); connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,int)), this, SLOT(vcsAnnotate(QString,QString,int))); - CVSEditor *e = qobject_cast(editor->widget()); + CvsEditor *e = qobject_cast(editor->widget()); if (!e) return 0; s.replace(QLatin1Char(' '), QLatin1Char('_')); @@ -1302,55 +1307,55 @@ Core::IEditor * CVSPlugin::showOutputInEditor(const QString& title, const QStrin e->setSource(source); if (codec) e->setCodec(codec); - Core::IEditor *ie = e->editor(); - Core::EditorManager::instance()->activateEditor(ie, Core::EditorManager::ModeSwitch); + IEditor *ie = e->editor(); + EditorManager::instance()->activateEditor(ie, EditorManager::ModeSwitch); return ie; } -CVSSettings CVSPlugin::settings() const +CvsSettings CvsPlugin::settings() const { return m_settings; } -void CVSPlugin::setSettings(const CVSSettings &s) +void CvsPlugin::setSettings(const CvsSettings &s) { if (s != m_settings) { m_settings = s; - if (QSettings *settings = Core::ICore::instance()->settings()) + if (QSettings *settings = ICore::instance()->settings()) m_settings.toSettings(settings); cvsVersionControl()->emitConfigurationChanged(); } } -CVSPlugin *CVSPlugin::instance() +CvsPlugin *CvsPlugin::instance() { QTC_ASSERT(m_cvsPluginInstance, return m_cvsPluginInstance); return m_cvsPluginInstance; } -bool CVSPlugin::vcsAdd(const QString &workingDir, const QString &rawFileName) +bool CvsPlugin::vcsAdd(const QString &workingDir, const QString &rawFileName) { QStringList args; args << QLatin1String("add") << rawFileName; - const CVSResponse response = - runCVS(workingDir, args, m_settings.timeOutMS(), + const CvsResponse response = + runCvs(workingDir, args, m_settings.timeOutMS(), SshPasswordPrompt|ShowStdOutInLogWindow); - return response.result == CVSResponse::Ok; + return response.result == CvsResponse::Ok; } -bool CVSPlugin::vcsDelete(const QString &workingDir, const QString &rawFileName) +bool CvsPlugin::vcsDelete(const QString &workingDir, const QString &rawFileName) { QStringList args; args << QLatin1String("remove") << QLatin1String("-f") << rawFileName; - const CVSResponse response = - runCVS(workingDir, args, m_settings.timeOutMS(), + const CvsResponse response = + runCvs(workingDir, args, m_settings.timeOutMS(), SshPasswordPrompt|ShowStdOutInLogWindow); - return response.result == CVSResponse::Ok; + return response.result == CvsResponse::Ok; } /* CVS has a "CVS" directory in each directory it manages. The top level * is the first directory under the directory that does not have it. */ -bool CVSPlugin::managesDirectory(const QString &directory, QString *topLevel /* = 0 */) const +bool CvsPlugin::managesDirectory(const QString &directory, QString *topLevel /* = 0 */) const { if (topLevel) topLevel->clear(); @@ -1373,7 +1378,7 @@ bool CVSPlugin::managesDirectory(const QString &directory, QString *topLevel /* } } } while (false); - if (CVS::Constants::debug) { + if (Cvs::Constants::debug) { QDebug nsp = qDebug().nospace(); nsp << "CVSPlugin::managesDirectory" << directory << manages; if (topLevel) @@ -1382,20 +1387,20 @@ bool CVSPlugin::managesDirectory(const QString &directory, QString *topLevel /* return manages; } -bool CVSPlugin::checkCVSDirectory(const QDir &directory) const +bool CvsPlugin::checkCVSDirectory(const QDir &directory) const { const QString cvsDir = directory.absoluteFilePath(QLatin1String("CVS")); return QFileInfo(cvsDir).isDir(); } -CVSControl *CVSPlugin::cvsVersionControl() const +CvsControl *CvsPlugin::cvsVersionControl() const { - return static_cast(versionControl()); + return static_cast(versionControl()); } } // namespace Internal -} // namespace CVS +} // namespace Cvs -Q_EXPORT_PLUGIN(CVS::Internal::CVSPlugin) +Q_EXPORT_PLUGIN(Cvs::Internal::CvsPlugin) #include "cvsplugin.moc" diff --git a/src/plugins/cvs/cvsplugin.h b/src/plugins/cvs/cvsplugin.h index 28be7b4ba0..8652e21793 100644 --- a/src/plugins/cvs/cvsplugin.h +++ b/src/plugins/cvs/cvsplugin.h @@ -45,32 +45,25 @@ class QTextCodec; QT_END_NAMESPACE namespace Core { - class IEditorFactory; - class IVersionControl; +class IEditorFactory; +class IVersionControl; } -namespace Utils { - class ParameterAction; -} - -namespace VcsBase { - class VcsBaseSubmitEditor; -} +namespace Utils { class ParameterAction; } +namespace VcsBase { class VcsBaseSubmitEditor; } +namespace Locator { class CommandLocator; } -namespace Locator { - class CommandLocator; -} - -namespace CVS { +namespace Cvs { namespace Internal { + struct CvsDiffParameters; -class CVSSubmitEditor; -class CVSControl; +class CvsSubmitEditor; +class CvsControl; -struct CVSResponse +struct CvsResponse { enum Result { Ok, NonNullExitCode, OtherError }; - CVSResponse() : result(Ok) {} + CvsResponse() : result(Ok) {} Result result; QString stdOut; @@ -78,22 +71,22 @@ struct CVSResponse QString message; }; -class CVSPlugin : public VcsBase::VcsBasePlugin +class CvsPlugin : public VcsBase::VcsBasePlugin { Q_OBJECT public: - CVSPlugin(); - ~CVSPlugin(); + CvsPlugin(); + ~CvsPlugin(); virtual bool initialize(const QStringList &arguments, QString *errorMessage); void cvsDiff(const QString &workingDir, const QStringList &files); - CVSSubmitEditor *openCVSSubmitEditor(const QString &fileName); + CvsSubmitEditor *openCVSSubmitEditor(const QString &fileName); - CVSSettings settings() const; - void setSettings(const CVSSettings &s); + CvsSettings settings() const; + void setSettings(const CvsSettings &s); // IVersionControl bool vcsAdd(const QString &workingDir, const QString &fileName); @@ -102,7 +95,7 @@ public: // cvs 'edit' is used to implement 'open' (cvsnt). bool edit(const QString &topLevel, const QStringList &files); - static CVSPlugin *instance(); + static CvsPlugin *instance(); public slots: void vcsAnnotate(const QString &file, const QString &revision /* = QString() */, int lineNumber); @@ -131,7 +124,7 @@ private slots: void editCurrentFile(); void uneditCurrentFile(); void uneditCurrentRepository(); - void cvsDiff(const CVS::Internal::CvsDiffParameters &p); + void cvsDiff(const Cvs::Internal::CvsDiffParameters &p); protected: virtual void updateActions(VcsBase::VcsBasePlugin::ActionState); @@ -139,11 +132,11 @@ protected: private: bool isCommitEditorOpen() const; - Core::IEditor * showOutputInEditor(const QString& title, const QString &output, - int editorType, const QString &source, - QTextCodec *codec); + Core::IEditor *showOutputInEditor(const QString& title, const QString &output, + int editorType, const QString &source, + QTextCodec *codec); - CVSResponse runCVS(const QString &workingDirectory, + CvsResponse runCvs(const QString &workingDirectory, const QStringList &arguments, int timeOut, unsigned flags, QTextCodec *outputCodec = 0); @@ -152,7 +145,7 @@ private: const QString &revision = QString(), int lineNumber= -1); bool describe(const QString &source, const QString &changeNr, QString *errorMessage); bool describe(const QString &toplevel, const QString &source, const QString &changeNr, QString *errorMessage); - bool describe(const QString &repository, QList entries, QString *errorMessage); + bool describe(const QString &repository, QList entries, QString *errorMessage); void filelog(const QString &workingDir, const QStringList &files = QStringList(), bool enableAnnotationContextMenu = false); @@ -166,9 +159,9 @@ private: void startCommit(const QString &workingDir, const QStringList &files = QStringList()); bool commit(const QString &messageFile, const QStringList &subVersionFileList); void cleanCommitMessageFile(); - inline CVSControl *cvsVersionControl() const; + inline CvsControl *cvsVersionControl() const; - CVSSettings m_settings; + CvsSettings m_settings; QString m_commitMessageFileName; QString m_commitRepository; @@ -202,10 +195,10 @@ private: QAction *m_menuAction; bool m_submitActionTriggered; - static CVSPlugin *m_cvsPluginInstance; + static CvsPlugin *m_cvsPluginInstance; }; -} // namespace CVS +} // namespace Cvs } // namespace Internal #endif // CVSPLUGIN_H diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index 267437f3b3..5e2496bdf3 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -56,10 +56,10 @@ static QString defaultCommand() return rc; } -namespace CVS { +namespace Cvs { namespace Internal { -CVSSettings::CVSSettings() : +CvsSettings::CvsSettings() : cvsCommand(defaultCommand()), cvsDiffOptions(QLatin1String(defaultDiffOptions)), timeOutS(defaultTimeOutS), @@ -68,7 +68,7 @@ CVSSettings::CVSSettings() : { } -void CVSSettings::fromSettings(QSettings *settings) +void CvsSettings::fromSettings(QSettings *settings) { settings->beginGroup(QLatin1String(groupC)); cvsCommand = settings->value(QLatin1String(commandKeyC), defaultCommand()).toString(); @@ -80,7 +80,7 @@ void CVSSettings::fromSettings(QSettings *settings) settings->endGroup(); } -void CVSSettings::toSettings(QSettings *settings) const +void CvsSettings::toSettings(QSettings *settings) const { settings->beginGroup(QLatin1String(groupC)); settings->setValue(QLatin1String(commandKeyC), cvsCommand); @@ -92,7 +92,7 @@ void CVSSettings::toSettings(QSettings *settings) const settings->endGroup(); } -bool CVSSettings::equals(const CVSSettings &s) const +bool CvsSettings::equals(const CvsSettings &s) const { return promptToSubmit == s.promptToSubmit && describeByCommitId == s.describeByCommitId @@ -102,7 +102,7 @@ bool CVSSettings::equals(const CVSSettings &s) const && cvsDiffOptions == s.cvsDiffOptions; } -QStringList CVSSettings::addOptions(const QStringList &args) const +QStringList CvsSettings::addOptions(const QStringList &args) const { if (cvsRoot.isEmpty()) return args; @@ -115,4 +115,4 @@ QStringList CVSSettings::addOptions(const QStringList &args) const } } // namespace Internal -} // namespace CVS +} // namespace Cvs diff --git a/src/plugins/cvs/cvssettings.h b/src/plugins/cvs/cvssettings.h index 926697977b..29b40ba01c 100644 --- a/src/plugins/cvs/cvssettings.h +++ b/src/plugins/cvs/cvssettings.h @@ -39,23 +39,23 @@ QT_BEGIN_NAMESPACE class QSettings; QT_END_NAMESPACE -namespace CVS { +namespace Cvs { namespace Internal { -struct CVSSettings +struct CvsSettings { - CVSSettings(); + CvsSettings(); void fromSettings(QSettings *); void toSettings(QSettings *) const; - inline int timeOutMS() const { return timeOutS * 1000; } - inline int longTimeOutMS() const { return timeOutS * 10000; } + int timeOutMS() const { return timeOutS * 1000; } + int longTimeOutMS() const { return timeOutS * 10000; } // Add common options to the command line QStringList addOptions(const QStringList &args) const; - bool equals(const CVSSettings &s) const; + bool equals(const CvsSettings &s) const; QString cvsCommand; QString cvsRoot; @@ -65,12 +65,12 @@ struct CVSSettings bool describeByCommitId; }; -inline bool operator==(const CVSSettings &p1, const CVSSettings &p2) +inline bool operator==(const CvsSettings &p1, const CvsSettings &p2) { return p1.equals(p2); } -inline bool operator!=(const CVSSettings &p1, const CVSSettings &p2) +inline bool operator!=(const CvsSettings &p1, const CvsSettings &p2) { return !p1.equals(p2); } } // namespace Internal -} // namespace CVS +} // namespace Cvs #endif // CVSSETTINGS_H diff --git a/src/plugins/cvs/cvssubmiteditor.cpp b/src/plugins/cvs/cvssubmiteditor.cpp index 3cf6eb615a..fac5436203 100644 --- a/src/plugins/cvs/cvssubmiteditor.cpp +++ b/src/plugins/cvs/cvssubmiteditor.cpp @@ -36,18 +36,19 @@ #include #include -using namespace CVS::Internal; +using namespace Cvs::Internal; +using namespace VcsBase; -CVSSubmitEditor::CVSSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, - QWidget *parentWidget) : - VcsBase::VcsBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget)), +CvsSubmitEditor::CvsSubmitEditor(const VcsBaseSubmitEditorParameters *parameters, + QWidget *parentWidget) : + VcsBaseSubmitEditor(parameters, new Utils::SubmitEditorWidget(parentWidget)), m_msgAdded(tr("Added")), m_msgRemoved(tr("Removed")), m_msgModified(tr("Modified")) { } -QString CVSSubmitEditor::stateName(State st) const +QString CvsSubmitEditor::stateName(State st) const { switch (st) { case LocallyAdded: @@ -60,10 +61,10 @@ QString CVSSubmitEditor::stateName(State st) const return QString(); } -void CVSSubmitEditor::setStateList(const QList &statusOutput) +void CvsSubmitEditor::setStateList(const StateFilePairs &statusOutput) { - typedef QList::const_iterator ConstIterator; - VcsBase::SubmitFileModel *model = new VcsBase::SubmitFileModel(this); + typedef StateFilePairs::const_iterator ConstIterator; + SubmitFileModel *model = new SubmitFileModel(this); const ConstIterator cend = statusOutput.constEnd(); for (ConstIterator it = statusOutput.constBegin(); it != cend; ++it) diff --git a/src/plugins/cvs/cvssubmiteditor.h b/src/plugins/cvs/cvssubmiteditor.h index 17f54474f6..96416fa562 100644 --- a/src/plugins/cvs/cvssubmiteditor.h +++ b/src/plugins/cvs/cvssubmiteditor.h @@ -38,30 +38,33 @@ #include -namespace CVS { +namespace Cvs { namespace Internal { -class CVSSubmitEditor : public VcsBase::VcsBaseSubmitEditor +class CvsSubmitEditor : public VcsBase::VcsBaseSubmitEditor { Q_OBJECT + public: enum State { LocallyAdded, LocallyModified, LocallyRemoved }; // A list of state indicators and file names. typedef QPair StateFilePair; + typedef QList StateFilePairs; - explicit CVSSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, + explicit CvsSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters, QWidget *parentWidget = 0); - void setStateList(const QList &statusOutput); + void setStateList(const StateFilePairs &statusOutput); private: - inline QString stateName(State st) const; + QString stateName(State st) const; + const QString m_msgAdded; const QString m_msgRemoved; const QString m_msgModified; }; } // namespace Internal -} // namespace CVS +} // namespace Cvs #endif // CVSSUBMITEDITOR_H diff --git a/src/plugins/cvs/cvsutils.cpp b/src/plugins/cvs/cvsutils.cpp index cd294948cf..e71121d690 100644 --- a/src/plugins/cvs/cvsutils.cpp +++ b/src/plugins/cvs/cvsutils.cpp @@ -36,24 +36,24 @@ #include #include -namespace CVS { +namespace Cvs { namespace Internal { -CVS_Revision::CVS_Revision(const QString &rev) : +CvsRevision::CvsRevision(const QString &rev) : revision(rev) { } -CVS_LogEntry::CVS_LogEntry(const QString &f) : +CvsLogEntry::CvsLogEntry(const QString &f) : file(f) { } -QDebug operator<<(QDebug d, const CVS_LogEntry &e) +QDebug operator<<(QDebug d, const CvsLogEntry &e) { QDebug nospace = d.nospace(); nospace << "File: " << e.file << e.revisions.size() << '\n'; - foreach(const CVS_Revision &r, e.revisions) + foreach(const CvsRevision &r, e.revisions) nospace << " " << r.revision << ' ' << r.date << ' ' << r.commitId << '\n'; return d; } @@ -74,13 +74,13 @@ revision 1.1 ============================================================================= \endcode */ -QList parseLogEntries(const QString &o, - const QString &directory, - const QString filterCommitId) +QList parseLogEntries(const QString &o, + const QString &directory, + const QString filterCommitId) { enum ParseState { FileState, RevisionState, StatusLineState }; - QList rc; + QList rc; const QStringList lines = o.split(QString(QLatin1Char('\n')), QString::SkipEmptyParts); ParseState state = FileState; @@ -104,13 +104,13 @@ QList parseLogEntries(const QString &o, if (!file.isEmpty()) file += slash; file += line.mid(workingFilePrefix.size()).trimmed(); - rc.push_back(CVS_LogEntry(file)); + rc.push_back(CvsLogEntry(file)); state = RevisionState; } break; case RevisionState: if (revisionPattern.exactMatch(line)) { - rc.back().revisions.push_back(CVS_Revision(revisionPattern.cap(1))); + rc.back().revisions.push_back(CvsRevision(revisionPattern.cap(1))); state = StatusLineState; } else { if (line == fileSeparator) @@ -132,7 +132,7 @@ QList parseLogEntries(const QString &o, } // Purge out files with no matching commits if (!filterCommitId.isEmpty()) { - for (QList::iterator it = rc.begin(); it != rc.end(); ) { + for (QList::iterator it = rc.begin(); it != rc.end(); ) { if (it->revisions.empty()) { it = rc.erase(it); } else { @@ -176,16 +176,16 @@ QString fixDiffOutput(QString d) // stdout/stderr need to be merged to catch directories. // Parse out status keywords, return state enum or -1 -inline int stateFromKeyword(const QString &s) +static int stateFromKeyword(const QString &s) { if (s == QLatin1String("Up-to-date")) return -1; if (s == QLatin1String("Locally Modified")) - return CVSSubmitEditor::LocallyModified; + return CvsSubmitEditor::LocallyModified; if (s == QLatin1String("Locally Added")) - return CVSSubmitEditor::LocallyAdded; + return CvsSubmitEditor::LocallyAdded; if (s == QLatin1String("Locally Removed")) - return CVSSubmitEditor::LocallyRemoved; + return CvsSubmitEditor::LocallyRemoved; return -1; } @@ -216,9 +216,9 @@ StateList parseStatusOutput(const QString &directory, const QString &output) continue; // Concatenate file name, Correct "no file " QString fileName = l.mid(fileKeyword.size(), statusPos - fileKeyword.size()).trimmed(); - if (state == CVSSubmitEditor::LocallyRemoved && fileName.startsWith(noFileKeyword)) + if (state == CvsSubmitEditor::LocallyRemoved && fileName.startsWith(noFileKeyword)) fileName.remove(0, noFileKeyword.size()); - changeSet.push_back(CVSSubmitEditor::StateFilePair(static_cast(state), path + fileName)); + changeSet.push_back(CvsSubmitEditor::StateFilePair(static_cast(state), path + fileName)); continue; } // Examining a new subdirectory @@ -254,4 +254,4 @@ bool isFirstRevision(const QString &r) } } // namespace Internal -} // namespace CVS +} // namespace Cvs diff --git a/src/plugins/cvs/cvsutils.h b/src/plugins/cvs/cvsutils.h index 4ab18279ff..4a7cd580c9 100644 --- a/src/plugins/cvs/cvsutils.h +++ b/src/plugins/cvs/cvsutils.h @@ -42,15 +42,15 @@ QT_BEGIN_NAMESPACE class QDebug; QT_END_NAMESPACE -namespace CVS { +namespace Cvs { namespace Internal { // Utilities to parse output of a CVS log. // A revision of a file. -struct CVS_Revision +struct CvsRevision { - CVS_Revision(const QString &rev); + CvsRevision(const QString &rev); QString revision; QString date; // ISO-Format (YYYY-MM-DD) @@ -58,21 +58,21 @@ struct CVS_Revision }; // A log entry consisting of the file and its revisions. -struct CVS_LogEntry +struct CvsLogEntry { - CVS_LogEntry(const QString &file); + CvsLogEntry(const QString &file); QString file; - QList revisions; + QList revisions; }; -QDebug operator<<(QDebug d, const CVS_LogEntry &); +QDebug operator<<(QDebug d, const CvsLogEntry &); // Parse. Pass on a directory to obtain full paths when // running from the repository directory. -QList parseLogEntries(const QString &output, - const QString &directory = QString(), - const QString filterCommitId = QString()); +QList parseLogEntries(const QString &output, + const QString &directory = QString(), + const QString filterCommitId = QString()); // Tortoise CVS outputs unknown files with question marks in // the diff output on stdout ('? foo'); remove @@ -80,7 +80,7 @@ QString fixDiffOutput(QString d); // Parse the status output of CVS (stdout/stderr merged // to catch directories). -typedef QList StateList; +typedef CvsSubmitEditor::StateFilePairs StateList; StateList parseStatusOutput(const QString &directory, const QString &output); // Revision number utilities: Decrement version number "1.2" -> "1.1" @@ -89,6 +89,6 @@ QString previousRevision(const QString &rev); bool isFirstRevision(const QString &r); } // namespace Internal -} // namespace CVS +} // namespace Cvs #endif // CVSUTILS_H diff --git a/src/plugins/cvs/settingspage.cpp b/src/plugins/cvs/settingspage.cpp index 5fdbfbcc4a..dcfbd970a7 100644 --- a/src/plugins/cvs/settingspage.cpp +++ b/src/plugins/cvs/settingspage.cpp @@ -43,7 +43,7 @@ #include #include -using namespace CVS::Internal; +using namespace Cvs::Internal; using namespace Utils; SettingsPageWidget::SettingsPageWidget(QWidget *parent) : @@ -54,9 +54,9 @@ SettingsPageWidget::SettingsPageWidget(QWidget *parent) : m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command")); } -CVSSettings SettingsPageWidget::settings() const +CvsSettings SettingsPageWidget::settings() const { - CVSSettings rc; + CvsSettings rc; rc.cvsCommand = m_ui.commandPathChooser->path(); rc.cvsRoot = m_ui.rootLineEdit->text(); rc.cvsDiffOptions = m_ui.diffOptionsLineEdit->text(); @@ -66,7 +66,7 @@ CVSSettings SettingsPageWidget::settings() const return rc; } -void SettingsPageWidget::setSettings(const CVSSettings &s) +void SettingsPageWidget::setSettings(const CvsSettings &s) { m_ui.commandPathChooser->setPath(s.cvsCommand); m_ui.rootLineEdit->setText(s.cvsRoot); @@ -94,10 +94,6 @@ QString SettingsPageWidget::searchKeywords() const return rc; } -SettingsPage::SettingsPage() -{ -} - QString SettingsPage::id() const { return QLatin1String(VcsBase::Constants::VCS_ID_CVS); @@ -111,7 +107,7 @@ QString SettingsPage::displayName() const QWidget *SettingsPage::createPage(QWidget *parent) { m_widget = new SettingsPageWidget(parent); - m_widget->setSettings(CVSPlugin::instance()->settings()); + m_widget->setSettings(CvsPlugin::instance()->settings()); if (m_searchKeywords.isEmpty()) m_searchKeywords = m_widget->searchKeywords(); return m_widget; @@ -119,7 +115,7 @@ QWidget *SettingsPage::createPage(QWidget *parent) void SettingsPage::apply() { - CVSPlugin::instance()->setSettings(m_widget->settings()); + CvsPlugin::instance()->setSettings(m_widget->settings()); } bool SettingsPage::matches(const QString &s) const diff --git a/src/plugins/cvs/settingspage.h b/src/plugins/cvs/settingspage.h index 0438f0947a..5c849fc0f1 100644 --- a/src/plugins/cvs/settingspage.h +++ b/src/plugins/cvs/settingspage.h @@ -45,10 +45,10 @@ QT_BEGIN_NAMESPACE class QSettings; QT_END_NAMESPACE -namespace CVS { +namespace Cvs { namespace Internal { -struct CVSSettings; +struct CvsSettings; class SettingsPageWidget : public QWidget { @@ -57,8 +57,8 @@ class SettingsPageWidget : public QWidget public: explicit SettingsPageWidget(QWidget *parent = 0); - CVSSettings settings() const; - void setSettings(const CVSSettings &); + CvsSettings settings() const; + void setSettings(const CvsSettings &); QString searchKeywords() const; @@ -72,22 +72,22 @@ class SettingsPage : public VcsBase::VcsBaseOptionsPage Q_OBJECT public: - SettingsPage(); + SettingsPage() {} QString id() const; QString displayName() const; QWidget *createPage(QWidget *parent); void apply(); - void finish() { } - virtual bool matches(const QString &) const; + void finish() {} + bool matches(const QString &) const; private: QString m_searchKeywords; - SettingsPageWidget* m_widget; + SettingsPageWidget *m_widget; }; -} // namespace CVS +} // namespace Cvs } // namespace Internal #endif // SETTINGSPAGE_H -- GitLab