From 878e3d5bf0843410dc80002568c402775cc5b053 Mon Sep 17 00:00:00 2001 From: blacksun Date: Sun, 5 Mar 2017 12:24:33 +0000 Subject: [PATCH] Remove some unused or obsolete code. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4926 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/diagram.cpp | 16 ++---- sources/diagram.h | 1 - sources/projectview.cpp | 43 ++++------------ sources/projectview.h | 105 ++++++++++++++++++---------------------- 4 files changed, 63 insertions(+), 102 deletions(-) diff --git a/sources/diagram.cpp b/sources/diagram.cpp index 5b80858ed..f5e0dde8f 100644 --- a/sources/diagram.cpp +++ b/sources/diagram.cpp @@ -958,21 +958,15 @@ void Diagram::write(const QDomElement &element) { emit(written()); } -/** - @return true si la fonction write a deja ete appele (pour etre plus exact : - si le document XML utilise en interne n'est pas vide), false sinon -*/ -bool Diagram::wasWritten() const { - return(!xml_document_.isNull()); -} - /** @return le schema en XML tel qu'il doit etre enregistre dans le fichier projet @param xml_doc document XML a utiliser pour creer l'element */ -QDomElement Diagram::writeXml(QDomDocument &xml_doc) const { - // si le schema n'a pas ete enregistre explicitement, on n'ecrit rien - if (!wasWritten()) return(QDomElement()); +QDomElement Diagram::writeXml(QDomDocument &xml_doc) const +{ + //If diagram was not explicitely saved, we write nothing. + if (xml_document_.isNull()) + return(QDomElement()); QDomElement diagram_elmt = xml_document_.documentElement(); QDomNode new_node = xml_doc.importNode(diagram_elmt, true); diff --git a/sources/diagram.h b/sources/diagram.h index a840f2ff9..8049ae2be 100644 --- a/sources/diagram.h +++ b/sources/diagram.h @@ -157,7 +157,6 @@ class Diagram : public QGraphicsScene bool fromXml(QDomElement &, QPointF = QPointF(), bool = true, DiagramContent * = 0); void write(); void write(const QDomElement &); - bool wasWritten() const; QDomElement writeXml(QDomDocument &) const; void folioSequentialsToXml(QHash*, QDomElement *, QString, QString, QDomDocument *); void folioSequentialsFromXml(const QDomElement&, QHash*, QString, QString, QString, QString); diff --git a/sources/projectview.cpp b/sources/projectview.cpp index f14746bae..8b9c5cb02 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -93,29 +93,6 @@ QList ProjectView::diagram_views() const { return(m_diagram_view_list); } -/** - @return A list containing child diagrams matching provided \a options. -*/ -QList ProjectView::getDiagrams(ProjectSaveOptions options) { - QList selection; - if ((options & AllDiagrams) == AllDiagrams) { - selection << m_project -> diagrams(); - } else { - Diagram *current = 0; - if (DiagramView *view = currentDiagram()) { - current = view -> diagram(); - } - if (options & CurrentDiagram) { - if (current) selection << current; - } else if (options & AllDiagramsButCurrent) { - selection = m_project -> diagrams(); - selection.removeOne(current); - } - } - - return(selection); -} - /** * @brief ProjectView::currentDiagram * @return The current active diagram view or nullptr if there isn't diagramView in this project view. @@ -696,7 +673,7 @@ void ProjectView::exportProject() { @return a QETResult object reflecting the situation */ QETResult ProjectView::save() { - return(doSave(AllDiagrams)); + return(doSave()); } /** @@ -706,38 +683,38 @@ QETResult ProjectView::save() { @return a QETResult object reflecting the situation; note that a valid QETResult object is returned if the operation was cancelled. */ -QETResult ProjectView::saveAs(ProjectSaveOptions options) { +QETResult ProjectView::saveAs() +{ if (!m_project) return(noProjectResult()); QString filepath = askUserForFilePath(); if (filepath.isEmpty()) return(QETResult()); - return(doSave(options)); + return(doSave()); } /** - Save project content according to \a options, then write the project file. May + Save project content, then write the project file. May call saveAs if no filepath was provided before. - @param options May be used to specify what should be saved (e.g. modified - diagrams only). @return a QETResult object reflecting the situation; note that a valid QETResult object is returned if the operation was cancelled. */ -QETResult ProjectView::doSave(ProjectSaveOptions options) { +QETResult ProjectView::doSave() +{ if (!m_project) return(noProjectResult()); if (m_project -> filePath().isEmpty()) { // The project has not been saved to a file yet, // so save() actually means saveAs(). - return(saveAs(options)); + return(saveAs()); } // look for diagrams matching the required save options - saveDiagrams(getDiagrams(options)); + saveDiagrams(m_project->diagrams()); // write to file QETResult result = m_project -> write(); updateWindowTitle(); - if (options == AllDiagrams) project()->undoStack()->clear(); + project()->undoStack()->clear(); return(result); } diff --git a/sources/projectview.h b/sources/projectview.h index 62f59d533..4e30fa0e3 100644 --- a/sources/projectview.h +++ b/sources/projectview.h @@ -35,37 +35,28 @@ class QVBoxLayout; This class provides a widget displaying the diagrams of a particular project using tabs. */ -class ProjectView : public QWidget { +class ProjectView : public QWidget +{ Q_OBJECT - + + // constructors, destructor public: - enum ProjectSaveOption { - CurrentDiagram = 2, - AllDiagramsButCurrent = 4, - AllDiagrams = 6 - }; - Q_DECLARE_FLAGS(ProjectSaveOptions, ProjectSaveOption) - - - // constructors, destructor - public: - ProjectView(QETProject *, QWidget * = 0); - virtual ~ProjectView(); + ProjectView(QETProject *, QWidget * = 0); + virtual ~ProjectView(); private: - ProjectView(const ProjectView &); + ProjectView(const ProjectView &); - // methods + // methods public: - QETProject *project(); - void setProject(QETProject *); - QList diagram_views() const; - QList getDiagrams(ProjectSaveOptions options); - DiagramView *currentDiagram() const; - void closeEvent(QCloseEvent *); - void changeTabUp(); - void changeTabDown(); - void changeFirstTab(); - void changeLastTab(); + QETProject *project(); + void setProject(QETProject *); + QList diagram_views() const; + DiagramView *currentDiagram() const; + void closeEvent(QCloseEvent *); + void changeTabUp(); + void changeTabDown(); + void changeFirstTab(); + void changeLastTab(); public slots: void addNewDiagram(); @@ -92,8 +83,8 @@ class ProjectView : public QWidget { void printProject(); void exportProject(); QETResult save(); - QETResult saveAs(ProjectSaveOptions = ProjectSaveOptions(AllDiagrams)); - QETResult doSave(ProjectSaveOptions); + QETResult saveAs(); + QETResult doSave(); void saveDiagrams(const QList &); int cleanProject(); void updateWindowTitle(); @@ -112,38 +103,38 @@ class ProjectView : public QWidget { void editElementRequired(const ElementsLocation &); private: - void initActions(); - void initWidgets(); - void initLayout(); - void loadDiagrams(); - DiagramView *findDiagram(Diagram *); - DiagramView *nextDiagram(); - DiagramView *previousDiagram(); - DiagramView *firstDiagram(); - DiagramView *lastDiagram(); - void rebuildDiagramsMap(); - bool tryClosing(); - bool tryClosingElementEditors(); - int tryClosingDiagrams(); - QString askUserForFilePath(bool = true); - QETResult noProjectResult() const; + void initActions(); + void initWidgets(); + void initLayout(); + void loadDiagrams(); + DiagramView *findDiagram(Diagram *); + DiagramView *nextDiagram(); + DiagramView *previousDiagram(); + DiagramView *firstDiagram(); + DiagramView *lastDiagram(); + void rebuildDiagramsMap(); + bool tryClosing(); + bool tryClosingElementEditors(); + int tryClosingDiagrams(); + QString askUserForFilePath(bool = true); + QETResult noProjectResult() const; private slots: - void tabChanged(int); - void tabDoubleClicked(int); - void setDisplayFallbackWidget(bool); - void adjustReadOnlyState(); + void tabChanged(int); + void tabDoubleClicked(int); + void setDisplayFallbackWidget(bool); + void adjustReadOnlyState(); - // attributes + // attributes private: - QAction *add_new_diagram_; - QETProject *m_project; - QVBoxLayout *layout_; - QWidget *fallback_widget_; - QLabel *fallback_label_; - QTabWidget *m_tab; - QMap m_diagram_ids; - QList m_diagram_view_list; + QAction *add_new_diagram_; + QETProject *m_project; + QVBoxLayout *layout_; + QWidget *fallback_widget_; + QLabel *fallback_label_; + QTabWidget *m_tab; + QMap m_diagram_ids; + QList m_diagram_view_list; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(ProjectView::ProjectSaveOptions) + #endif