rename *dlg to *dialog

svn path=/trunk/KDE/kdesdk/cervisia/; revision=654431

CMakeLists.txt

@@ -11,13 +11,13 @@ configure_file (cervisia.1.cmake ${CMAKE_CURRENT_BINARY_DIR}/cervisia.1 @ONLY)
 ########### next target ###############
 
 set(libcervisia_SRCS
-   annotatedlg.cpp
-   diffdlg.cpp
-   patchoptiondlg.cpp
-   logdlg.cpp
-   progressdlg.cpp
-   resolvedlg.cpp
-   resolvedlg_p.cpp
+   annotatedialog.cpp
+   diffdialog.cpp
+   patchoptiondialog.cpp
+   logdialog.cpp
+   progressdialog.cpp
+   resolvedialog.cpp
+   resolvedialog_p.cpp
    annotateview.cpp
    diffview.cpp
    loglist.cpp
@@ -28,7 +28,7 @@ set(libcervisia_SRCS
    misc.cpp
    qttableview.cpp
    tooltip.cpp
-   settingsdlg.cpp
+   settingsdialog.cpp
 	)	
 
 qt4_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia.cvsservice.xml )
@@ -36,7 +36,7 @@ qt4_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia.cvsjob.xml
 qt4_add_dbus_interfaces( libcervisia_SRCS cvsservice/org.kde.cervisia.repository.xml )
 
 
-kde4_add_ui3_files(libcervisia_SRCS settingsdlg_advanced.ui )
+kde4_add_ui3_files(libcervisia_SRCS settingsdialog_advanced.ui )
 
 kde4_add_kcfg_files(libcervisia_SRCS cervisiasettings.kcfgc )
 
@@ -64,27 +64,27 @@ install(TARGETS cervisia  DESTINATION ${BIN_INSTALL_DIR} )
 set(cervisiapart_PART_SRCS ${libcervisia_SRCS}
    updateview.cpp 
    protocolview.cpp 
-   watchdlg.cpp 
-   changelogdlg.cpp 
-   historydlg.cpp 
-   repositorydlg.cpp 
-   commitdlg.cpp 
-   checkoutdlg.cpp 
-   updatedlg.cpp 
-   tagdlg.cpp 
-   mergedlg.cpp 
+   watchdialog.cpp 
+   changelogdialog.cpp 
+   historydialog.cpp 
+   repositorydialog.cpp 
+   commitdialog.cpp 
+   checkoutdialog.cpp 
+   updatedialog.cpp 
+   tagdialog.cpp 
+   mergedialog.cpp 
    cvsdir.cpp 
    repositories.cpp 
    cervisiapart.cpp 
-   addrepositorydlg.cpp 
-   addremovedlg.cpp 
-   watchersdlg.cpp 
+   addrepositorydialog.cpp 
+   addremovedialog.cpp 
+   watchersdialog.cpp 
    updateview_items.cpp 
    updateview_visitors.cpp 
    entry.cpp 
    entry_status.cpp 
    stringmatcher.cpp 
-   cvsinitdlg.cpp 
+   cvsinitdialog.cpp 
    ignorelistbase.cpp 
    dirignorelist.cpp 
    globalignorelist.cpp 

HACKING

@@ -78,7 +78,7 @@ public:
     FooDialog( QWidget* parent );
 };
 
-has files foodialog.h and foodialog.cpp instead of foodlg.h and foodlg.cpp
+has files foodialog.h and foodialog.cpp instead of foodialog.h and foodlg.cpp
 
 
 Class and Variable Names

addremovedlg.cpp → addremovedialog.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "addremovedlg.h"
+#include "addremovedialog.h"
 
 #include <qfileinfo.h>
 #include <qlabel.h>

addrepositorydlg.cpp → addrepositorydialog.cpp

@@ -19,7 +19,7 @@
  */
 
 
-#include "addrepositorydlg.h"
+#include "addrepositorydialog.h"
 
 #include <qcheckbox.h>
 #include <khbox.h>
@@ -207,7 +207,7 @@ void AddRepositoryDialog::compressionToggled(bool checked)
     m_compressionLevel->setEnabled(checked);
 }
 
-#include "addrepositorydlg.moc"
+#include "addrepositorydialog.moc"
 
 
 // Local Variables:

annotatectl.cpp

@@ -25,9 +25,9 @@
 #include <klocale.h>
 #include <kdatetime.h>
 
-#include "annotatedlg.h"
+#include "annotatedialog.h"
 #include "loginfo.h"
-#include "progressdlg.h"
+#include "progressdialog.h"
 #include "cvsserviceinterface.h"
 #include "cvsjobinterface.h"
 

annotatedlg.cpp → annotatedialog.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "annotatedlg.h"
+#include "annotatedialog.h"
 
 #include "annotateview.h"
 

cervisiapart.cpp

@@ -51,30 +51,30 @@
 #include <krecentfilesaction.h>
 
 #include <repositoryinterface.h>
-#include "progressdlg.h"
-#include "logdlg.h"
-#include "diffdlg.h"
-#include "resolvedlg.h"
-#include "annotatedlg.h"
+#include "progressdialog.h"
+#include "logdialog.h"
+#include "diffdialog.h"
+#include "resolvedialog.h"
+#include "annotatedialog.h"
 #include "annotatectl.h"
-#include "commitdlg.h"
-#include "updatedlg.h"
-#include "checkoutdlg.h"
-#include "tagdlg.h"
-#include "mergedlg.h"
-#include "historydlg.h"
+#include "commitdialog.h"
+#include "updatedialog.h"
+#include "checkoutdialog.h"
+#include "tagdialog.h"
+#include "mergedialog.h"
+#include "historydialog.h"
 #include "updateview.h"
 #include "updateview_items.h"
 #include "protocolview.h"
-#include "repositorydlg.h"
-#include "settingsdlg.h"
-#include "changelogdlg.h"
-#include "watchersdlg.h"
-#include "cvsinitdlg.h"
+#include "repositorydialog.h"
+#include "settingsdialog.h"
+#include "changelogdialog.h"
+#include "watchersdialog.h"
+#include "cvsinitdialog.h"
 #include "misc.h"
 #include "cvsserviceinterface.h"
 #include "globalignorelist.h"
-#include "patchoptiondlg.h"
+#include "patchoptiondialog.h"
 #include "editwithmenu.h"
 
 #include "cvsjobinterface.h"

cervisiapart.h

@@ -27,11 +27,11 @@
 #include <kparts/genericfactory.h>
 #include <kparts/statusbarextension.h>
 
-#include "addremovedlg.h"
-#include "commitdlg.h"
-#include "checkoutdlg.h"
-#include "watchdlg.h"
-#include "tagdlg.h"
+#include "addremovedialog.h"
+#include "commitdialog.h"
+#include "checkoutdialog.h"
+#include "watchdialog.h"
+#include "tagdialog.h"
 //Added by qt3to4:
 #include <QLabel>
 

changelogdlg.cpp → changelogdialog.cpp

@@ -19,8 +19,8 @@
  */
 
 
-#include "changelogdlg.h"
-#include "changelogdlg.moc"
+#include "changelogdialog.h"
+#include "changelogdialog.moc"
 #include <QDate>
 
 #include <qfile.h>

checkoutdlg.cpp → checkoutdialog.cpp

@@ -19,7 +19,7 @@
  */
 
 
-#include "checkoutdlg.h"
+#include "checkoutdialog.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -40,7 +40,7 @@
 #include <kurlcompletion.h>
 #include <kconfiggroup.h>
 
-#include "progressdlg.h"
+#include "progressdialog.h"
 #include "repositories.h"
 #include "misc.h"
 #include "cvsserviceinterface.h"
@@ -495,7 +495,7 @@ void CheckoutDialog::branchTextChanged()
 }
 
 
-#include "checkoutdlg.moc"
+#include "checkoutdialog.moc"
 
 
 // Local Variables:

commitdlg.cpp → commitdialog.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "commitdlg.h"
+#include "commitdialog.h"
 
 #include <qcombobox.h>
 #include <qcheckbox.h>
@@ -38,7 +38,7 @@
 
 #include "cvsserviceinterface.h"
 #include "logmessageedit.h"
-#include "diffdlg.h"
+#include "diffdialog.h"
 
 
 class CommitListItem : public Q3CheckListItem
@@ -330,7 +330,7 @@ void CommitDialog::removeTemplateText()
 }
 
 
-#include "commitdlg.moc"
+#include "commitdialog.moc"
 
 
 // Local Variables:

cvsinitdlg.cpp → cvsinitdialog.cpp

@@ -17,7 +17,7 @@
  */
 
 
-#include "cvsinitdlg.h"
+#include "cvsinitdialog.h"
 
 #include <qlabel.h>
 #include <qlayout.h>
@@ -100,4 +100,4 @@ void CvsInitDialog::lineEditTextChanged(const QString& text)
     enableButton(Ok, !text.trimmed().isEmpty());
 }
     
-#include "cvsinitdlg.moc"
+#include "cvsinitdialog.moc"

diffdlg.cpp → diffdialog.cpp

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "diffdlg.h"
+#include "diffdialog.h"
 
 #include <qpushbutton.h>
 #include <qcheckbox.h>
@@ -43,7 +43,7 @@
 #include <kconfiggroup.h>
 #include "cvsserviceinterface.h"
 #include "misc.h"
-#include "progressdlg.h"
+#include "progressdialog.h"
 #include "diffview.h"
 
 
@@ -512,7 +512,7 @@ void DiffDialog::saveAsClicked()
     f.close();
 }
 
-#include "diffdlg.moc"
+#include "diffdialog.moc"
 
 
 // Local Variables:

globalignorelist.cpp

@@ -25,7 +25,7 @@ using namespace Cervisia;
 #include <stdlib.h> // for getenv()
 
 #include "cvsserviceinterface.h"
-#include "progressdlg.h"
+#include "progressdialog.h"
 
 
 StringMatcher GlobalIgnoreList::m_stringMatcher;

historydlg.cpp → historydialog.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "historydlg.h"
+#include "historydialog.h"
 
 #include <qcheckbox.h>
 #include <qdatetime.h>
@@ -36,7 +36,7 @@
 
 #include "misc.h"
 #include "cvsserviceinterface.h"
-#include "progressdlg.h"
+#include "progressdialog.h"
 
 
 class HistoryItem : public Q3ListViewItem
@@ -381,7 +381,7 @@ bool HistoryDialog::parseHistory(OrgKdeCervisiaCvsserviceCvsserviceInterface* cv
     return true;
 }
 
-#include "historydlg.moc"
+#include "historydialog.moc"
 
 
 // Local Variables:

logdlg.cpp → logdialog.cpp

@@ -19,7 +19,7 @@
  */
 
 
-#include "logdlg.h"
+#include "logdialog.h"
 
 #include <qcombobox.h>
 #include <qfile.h>
@@ -48,16 +48,16 @@
 #include <kconfiggroup.h>
 
 #include "cvsserviceinterface.h"
-#include "annotatedlg.h"
+#include "annotatedialog.h"
 #include "annotatectl.h"
-#include "diffdlg.h"
+#include "diffdialog.h"
 #include "loginfo.h"
 #include "loglist.h"
 #include "logplainview.h"
 #include "logtree.h"
 #include "misc.h"
-#include "progressdlg.h"
-#include "patchoptiondlg.h"
+#include "progressdialog.h"
+#include "patchoptiondialog.h"
 
 
 LogDialog::LogDialog(KConfig& cfg, QWidget *parent)
@@ -624,7 +624,7 @@ void LogDialog::tabChanged(QWidget* w)
     showButton(User3, isPlainView);
 }
 
-#include "logdlg.moc"
+#include "logdialog.moc"
 
 // Local Variables:
 // c-basic-offset: 4

main.cpp

@@ -34,10 +34,10 @@
 #include "misc.h"
 #include "cervisiashell.h"
 #include "cvsserviceinterface.h"
-#include "annotatedlg.h"
+#include "annotatedialog.h"
 #include "annotatectl.h"
-#include "logdlg.h"
-#include "resolvedlg.h"
+#include "logdialog.h"
+#include "resolvedialog.h"
 #include "version.h"
 #include "repositoryinterface.h"
 

mergedlg.cpp → mergedialog.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "mergedlg.h"
+#include "mergedialog.h"
 
 #include <q3buttongroup.h>
 #include <qcombobox.h>
@@ -171,7 +171,7 @@ void MergeDialog::toggled()
         tag1_combo->setFocus();
 }
 
-#include "mergedlg.moc"
+#include "mergedialog.moc"
 
 
 // Local Variables:

misc.cpp

@@ -38,7 +38,7 @@
 #include <kdebug.h>
 
 #include "cvsserviceinterface.h"
-#include "progressdlg.h"
+#include "progressdialog.h"
 
 // These regular expression parts aren't useful to check the validity of the
 // CVSROOT specification. They are just used to extract the different parts of it.

patchoptiondlg.cpp → patchoptiondialog.cpp

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "patchoptiondlg.h"
+#include "patchoptiondialog.h"
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -123,4 +123,4 @@ void PatchOptionDialog::formatChanged(int buttonId)
     m_contextLines->setEnabled(enabled);
 }
 
-#include "patchoptiondlg.moc"
+#include "patchoptiondialog.moc"

progressdlg.cpp → progressdialog.cpp

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "progressdlg.h"
+#include "progressdialog.h"
 
 #include <qlabel.h>
 #include <qlayout.h>
@@ -280,4 +280,4 @@ void ProgressDialog::processOutput()
 }
 
 
-#include "progressdlg.moc"
+#include "progressdialog.moc"

repositorydlg.cpp → repositorydialog.cpp

@@ -19,7 +19,7 @@
  */
 
 
-#include "repositorydlg.h"
+#include "repositorydialog.h"
 
 #include <qlayout.h>
 #include <qpushbutton.h>
@@ -34,11 +34,11 @@
 #include <kdebug.h>
 #include <kconfiggroup.h>
 
-#include "addrepositorydlg.h"
+#include "addrepositorydialog.h"
 #include "cvsserviceinterface.h"
 #include "cvsjobinterface.h"
 #include "misc.h"
-#include "progressdlg.h"
+#include "progressdialog.h"
 #include "repositories.h"
 
 
@@ -520,6 +520,6 @@ void RepositoryDialog::writeRepositoryData(RepositoryListItem* item)
     repoGroup.writeEntry("RetrieveCvsignore", item->retrieveCvsignore());
 }
 
-#include "repositorydlg.moc"
+#include "repositorydialog.moc"
 
 // kate: space-indent on; indent-width 4; replace-tabs on;

resolvedlg.cpp → resolvedialog.cpp

@@ -19,7 +19,7 @@
  */
 
 
-#include "resolvedlg.h"
+#include "resolvedialog.h"
 
 #include <qfile.h>
 #include <qnamespace.h>
@@ -41,7 +41,7 @@
 #include <qregexp.h>
 #include <kconfiggroup.h>
 #include "misc.h"
-#include "resolvedlg_p.h"
+#include "resolvedialog_p.h"
 using Cervisia::ResolveEditorDialog;
 
 
@@ -645,7 +645,7 @@ QString ResolveDialog::contentVersionB(const ResolveItem *item)
     return result;
 }
 
-#include "resolvedlg.moc"
+#include "resolvedialog.moc"
 
 
 // Local Variables:

resolvedlg_p.cpp → resolvedialog_p.cpp

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "resolvedlg_p.h"
+#include "resolvedialog_p.h"
 
 #include <kconfig.h>
 #include <ktextedit.h>

settingsdlg.cpp → settingsdialog.cpp

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "settingsdlg.h"
+#include "settingsdialog.h"
 
 #include <qapplication.h>
 #include <qcheckbox.h>
@@ -416,7 +416,7 @@ void SettingsDialog::addLookAndFeelPage()
     m_splitterBox = new QCheckBox(i18n("Split main window &horizontally"), lookPage);
 }
 
-#include "settingsdlg.moc"
+#include "settingsdialog.moc"
 
 
 // Local Variables:

tagdlg.cpp → tagdialog.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "tagdlg.h"
+#include "tagdialog.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -153,7 +153,7 @@ void TagDialog::tagButtonClicked()
 }
 
 
-#include "tagdlg.moc"
+#include "tagdialog.moc"
 
 
 // Local Variables:

updatedlg.cpp → updatedialog.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "updatedlg.h"
+#include "updatedialog.h"
 
 #include <q3buttongroup.h>
 #include <qcombobox.h>
@@ -168,7 +168,7 @@ void UpdateDialog::toggled()
         date_edit->setFocus();
 }
 
-#include "updatedlg.moc"
+#include "updatedialog.moc"
 
 
 // Local Variables:

watchdlg.cpp → watchdialog.cpp

@@ -18,7 +18,7 @@
  */
 
 
-#include "watchdlg.h"
+#include "watchdialog.h"
 
 #include <q3buttongroup.h>
 #include <qcheckbox.h>

watchersdlg.cpp → watchersdialog.cpp

@@ -17,7 +17,7 @@
  */
 
 
-#include "watchersdlg.h"
+#include "watchersdialog.h"
 
 #include <qlayout.h>
 #include <q3table.h>
@@ -31,7 +31,7 @@
 
 #include "misc.h"
 #include "cvsserviceinterface.h"
-#include "progressd