From babd0f5419dd8e1c1a13aeef543fd8db8b0bc4ac Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Fri, 14 May 2010 07:37:14 +0000 Subject: [PATCH] * ./crlcore: - Change: In Cyclop, rename COpenCellDialog in OpenCellDialog. --- crlcore/src/cyclop/CMakeLists.txt | 4 ++-- crlcore/src/cyclop/Cyclop.cpp | 4 ++-- ...COpenCellDialog.cpp => OpenCellDialog.cpp} | 22 +++++++++---------- .../{COpenCellDialog.h => OpenCellDialog.h} | 10 +++------ 4 files changed, 18 insertions(+), 22 deletions(-) rename crlcore/src/cyclop/{COpenCellDialog.cpp => OpenCellDialog.cpp} (91%) rename crlcore/src/cyclop/{COpenCellDialog.h => OpenCellDialog.h} (94%) diff --git a/crlcore/src/cyclop/CMakeLists.txt b/crlcore/src/cyclop/CMakeLists.txt index ee73b75b..ed210380 100644 --- a/crlcore/src/cyclop/CMakeLists.txt +++ b/crlcore/src/cyclop/CMakeLists.txt @@ -6,9 +6,9 @@ ) set ( mocincludes Cyclop.h - COpenCellDialog.h + OpenCellDialog.h ) - set ( cpps COpenCellDialog.cpp + set ( cpps OpenCellDialog.cpp DemoGo.cpp Cyclop.cpp CyclopMain.cpp diff --git a/crlcore/src/cyclop/Cyclop.cpp b/crlcore/src/cyclop/Cyclop.cpp index e0b18cc0..e9b649c1 100644 --- a/crlcore/src/cyclop/Cyclop.cpp +++ b/crlcore/src/cyclop/Cyclop.cpp @@ -28,7 +28,7 @@ #include "hurricane/viewer/CellWidget.h" -#include "COpenCellDialog.h" +#include "OpenCellDialog.h" #include "DemoGo.h" #include "Cyclop.h" @@ -114,7 +114,7 @@ namespace CRL { QString cellName; bool newViewer; - if ( COpenCellDialog::runDialog ( this, cellName, newViewer ) ) { + if ( OpenCellDialog::runDialog ( this, cellName, newViewer ) ) { Cell* cell = getCellFromDb ( cellName.toStdString().c_str() ); if ( cell ) { if ( newViewer ) { diff --git a/crlcore/src/cyclop/COpenCellDialog.cpp b/crlcore/src/cyclop/OpenCellDialog.cpp similarity index 91% rename from crlcore/src/cyclop/COpenCellDialog.cpp rename to crlcore/src/cyclop/OpenCellDialog.cpp index 789a0a12..ad8c0887 100644 --- a/crlcore/src/cyclop/COpenCellDialog.cpp +++ b/crlcore/src/cyclop/OpenCellDialog.cpp @@ -43,7 +43,7 @@ // | Author : Jean-Paul CHAPUT | // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | -// | C++ Module : "./COpenCellDialog.cpp" | +// | C++ Module : "./OpenCellDialog.cpp" | // | *************************************************************** | // | U p d a t e s | // | | @@ -67,7 +67,7 @@ using namespace std; #include "crlcore/Environment.h" #include "crlcore/AllianceFramework.h" -#include "COpenCellDialog.h" +#include "OpenCellDialog.h" namespace CRL { @@ -78,12 +78,12 @@ namespace CRL { // ------------------------------------------------------------------- -// Class : "COpenCellDialog". +// Class : "OpenCellDialog". - COpenCellDialog::COpenCellDialog ( QWidget* parent ) - : QDialog(parent) - , _lineEdit(NULL) + OpenCellDialog::OpenCellDialog ( QWidget* parent ) + : QDialog (parent) + , _lineEdit (NULL) , _viewerCheckBox(NULL) { setWindowTitle ( tr("Open Cell") ); @@ -151,21 +151,21 @@ namespace CRL { } - const QString COpenCellDialog::getCellName () const + const QString OpenCellDialog::getCellName () const { return _lineEdit->text(); } - bool COpenCellDialog::newViewerRequest () const + bool OpenCellDialog::newViewerRequest () const { return _viewerCheckBox->isChecked(); } - bool COpenCellDialog::runDialog ( QWidget* parent, QString& name, bool& newViewerRequest ) + bool OpenCellDialog::runDialog ( QWidget* parent, QString& name, bool& newViewerRequest ) { - COpenCellDialog* dialog = new COpenCellDialog ( parent ); + OpenCellDialog* dialog = new OpenCellDialog ( parent ); bool dialogResult = (dialog->exec() == Accepted); name = dialog->getCellName (); @@ -177,7 +177,7 @@ namespace CRL { } - void COpenCellDialog::formatChanged ( int index ) + void OpenCellDialog::formatChanged ( int index ) { Environment* environment = AllianceFramework::get()->getEnvironment(); switch ( index ) { diff --git a/crlcore/src/cyclop/COpenCellDialog.h b/crlcore/src/cyclop/OpenCellDialog.h similarity index 94% rename from crlcore/src/cyclop/COpenCellDialog.h rename to crlcore/src/cyclop/OpenCellDialog.h index ff1f21e3..fa184a53 100644 --- a/crlcore/src/cyclop/COpenCellDialog.h +++ b/crlcore/src/cyclop/OpenCellDialog.h @@ -43,7 +43,7 @@ // | Author : Jean-Paul CHAPUT | // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | -// | C++ Header : "./COpenCellDialog.h" | +// | C++ Header : "./OpenCellDialog.h" | // | *************************************************************** | // | U p d a t e s | // | | @@ -62,26 +62,22 @@ class QLineEdit; namespace CRL { - class COpenCellDialog : public QDialog { + class OpenCellDialog : public QDialog { Q_OBJECT; - public: static bool runDialog ( QWidget* parent, QString& name, bool& newViewerRequest ); const QString getCellName () const; bool newViewerRequest () const; protected: - COpenCellDialog ( QWidget* parent=NULL ); + OpenCellDialog ( QWidget* parent=NULL ); protected slots: void formatChanged ( int ); - protected: QLineEdit* _lineEdit; QCheckBox* _viewerCheckBox; }; - - } // End of CRL namespace.