[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rocs] App/Ui: Remove duplicated code.
From:       Andreas Cord-Landwehr <cordlandwehr () kde ! org>
Date:       2013-05-22 20:18:34
Message-ID: 20130522201834.E255EA605B () git ! kde ! org
[Download RAW message or body]

Git commit 8055697b38b38518d46bb02780e0aab88858e3cc by Andreas Cord-Landwehr.
Committed on 22/05/2013 at 22:07.
Pushed by cordlandwehr into branch 'master'.

Remove duplicated code.

Both methods do the same.

M  +3    -20   App/Ui/MainWindow.cpp
M  +4    -6    App/Ui/MainWindow.h

http://commits.kde.org/rocs/8055697b38b38518d46bb02780e0aab88858e3cc

diff --git a/App/Ui/MainWindow.cpp b/App/Ui/MainWindow.cpp
index 6d35e1a..6ff8763 100644
--- a/App/Ui/MainWindow.cpp
+++ b/App/Ui/MainWindow.cpp
@@ -3,7 +3,7 @@
     Copyright 2008-2011  Tomaz Canabrava <tomaz.canabrava@gmail.com>
     Copyright 2008       Ugo Sangiori <ugorox@gmail.com>
     Copyright 2010-2011  Wagner Reck <wagner.reck@gmail.com>
-    Copyright 2011-2012  Andreas Cord-Landwehr <cola@uni-paderborn.de>
+    Copyright 2011-2013  Andreas Cord-Landwehr <cordlandwehr@kde.org>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -128,7 +128,7 @@ MainWindow::MainWindow()
             this, SLOT(releaseDocument(Document*)));
 
     // TODO: use welcome widget instead of creating default empty project
-    _currentProject = createNewProject();
+    createNewProject();
     updateCaption();
 
     GraphicsLayout::self()->setViewStyleDataNode(Settings::dataNodeDisplay());
@@ -222,18 +222,6 @@ void MainWindow::setupToolbars()
     }
 }
 
-Project* MainWindow::createNewProject()
-{
-    //TODO duplicated functionality with newProject(): merge them for 4.11
-    Project *newProject = new Project();
-    // create new document and add this to project new
-    newProject->addGraphFileNew(DocumentManager::self().newDocument());
-    newProject->addCodeFileNew(_codeEditor->newScript());
-    _journalWidget->openJournal(newProject);
-
-    return newProject;
-}
-
 void MainWindow::downloadNewExamples()
 {
     QPointer<KNS3::DownloadDialog> dialog = new KNS3::DownloadDialog("rocs.knsrc", this);
@@ -584,7 +572,6 @@ void MainWindow::importScript()
     Settings::setLastOpenedDirectory(startDirectory.toLocalFile());
 }
 
-
 void MainWindow::loadDocument(const QString& name)
 {
     if (!name.isEmpty() && !name.endsWith(QLatin1String(".graph"))) {
@@ -595,8 +582,7 @@ void MainWindow::loadDocument(const QString& name)
     DocumentManager::self().openDocument(KUrl::fromLocalFile(name));
 }
 
-
-void MainWindow::newProject()
+void MainWindow::createNewProject()
 {
     if (saveIfChanged() == KMessageBox::Cancel) {
         return;
@@ -613,13 +599,11 @@ void MainWindow::newProject()
     updateCaption();
 }
 
-
 void MainWindow::newProjectAssistant()
 {
     //TODO needs to be implemented
 }
 
-
 void MainWindow::saveProject(bool saveAs)
 {
     // save graphs and scripts
@@ -662,7 +646,6 @@ void MainWindow::saveProject(bool saveAs)
     Settings::setLastOpenedDirectory(_currentProject->projectFile().path());
 }
 
-
 void MainWindow::saveProjectAs()
 {
     saveProject(true);
diff --git a/App/Ui/MainWindow.h b/App/Ui/MainWindow.h
index 26ae6aa..d6fa298 100644
--- a/App/Ui/MainWindow.h
+++ b/App/Ui/MainWindow.h
@@ -3,7 +3,7 @@
     Copyright 2008-2011  Tomaz Canabrava <tomaz.canabrava@gmail.com>
     Copyright 2008       Ugo Sangiori <ugorox@gmail.com>
     Copyright 2009-2011  Wagner Reck <wagner.reck@gmail.com>
-    Copyright 2011-2012  Andreas Cord-Landwehr <cola@uni-paderborn.de>
+    Copyright 2011-2013  Andreas Cord-Landwehr <cordlandwehr@kde.org>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -93,11 +93,10 @@ private: // Methods
                       const char* slot, QObject *parent);
 
     /**
-     * Create an empty project configuration with one graph document and one code file.
-     * All files are temporary until saved.
-     * \return project pointer
+     * Create an empty project configuration with one graph document and one code file and set as
+     * current project. All files are temporary until saved.
      */
-    Project* createNewProject();
+    void createNewProject();
 
     /** setup menu with data structures plugins. */
     void setupDSPluginsAction();
@@ -144,7 +143,6 @@ private slots:
      */
     void addEmptyGraphDocument();
 
-    void newProject(); //TODO maybe not needed anymore, check after finish of new project assistant
     void newProjectAssistant();
     void saveProject(bool saveAs = false);
     void openProject(const KUrl& fileName = KUrl());

[prev in list] [next in list] [prev in thread] [next in thread]