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

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

Git commit 53c09630364d569744b589398a80b1d0ce1425b7 by Andreas Cord-Landwehr.
Committed on 22/05/2013 at 22:11.
Pushed by cordlandwehr into branch 'master'.

Remove compile guard.

Currently there is no possibility to build Rocs without QtScript, if
ever a new resource is added for scripting, we need a completely new
approach than compile guards.

M  +0    -21   App/Ui/MainWindow.cpp

http://commits.kde.org/rocs/53c09630364d569744b589398a80b1d0ce1425b7

diff --git a/App/Ui/MainWindow.cpp b/App/Ui/MainWindow.cpp
index 6ff8763..c6d21d8 100644
--- a/App/Ui/MainWindow.cpp
+++ b/App/Ui/MainWindow.cpp
@@ -740,7 +740,6 @@ void MainWindow::saveScripts()
     _codeEditor->saveAllScripts();
 }
 
-
 void MainWindow::newScript()
 {
     QString file = KInputDialog::getText(i18n("ScriptName"), i18n("Enter the name of your new script"));
@@ -753,8 +752,6 @@ void MainWindow::newScript()
     _codeEditor->newScript(KUrl::fromLocalFile(file));
 }
 
-
-
 void MainWindow::saveGraph(Document* document)
 {
     if (document == 0) {
@@ -768,7 +765,6 @@ void MainWindow::saveGraph(Document* document)
     }
 }
 
-
 void MainWindow::saveAllGraphs()
 {
     foreach(Document * document, DocumentManager::self().documentList()) {
@@ -782,7 +778,6 @@ void MainWindow::saveAllGraphs()
     }
 }
 
-
 void MainWindow::saveGraphAs()
 {
     saveGraphAs(DocumentManager::self().activeDocument());
@@ -802,7 +797,6 @@ void MainWindow::saveGraphAs(Document* document)
     _currentProject->saveGraphFileAs(document, file);
 }
 
-
 void MainWindow::newGraph()
 {
     QString file = KInputDialog::getText(i18n("Graph name"), i18n("Enter the name of the Graph"));
@@ -817,7 +811,6 @@ void MainWindow::newGraph()
     _currentProject->addGraphFile(file);
 }
 
-
 int MainWindow::saveIfChanged()
 {
 
@@ -868,7 +861,6 @@ int MainWindow::saveIfChanged()
     return KMessageBox::No;
 }
 
-
 void MainWindow::importGraphFile()
 {
     ImporterExporterManager importer(this);
@@ -884,7 +876,6 @@ void MainWindow::importGraphFile()
     }
 }
 
-
 void MainWindow::exportGraphFile()
 {
     ImporterExporterManager exp(this);
@@ -898,14 +889,12 @@ void MainWindow::showPossibleIncludes()
     dialog->exec();
 }
 
-
 void MainWindow::showLoadedPlugins()
 {
     QPointer<LoadedPluginsDialog> dialog = new LoadedPluginsDialog(this);
     dialog->exec();
 }
 
-
 void MainWindow::showCodeEditorConfig()
 {
     KTextEditor::Editor *editor = _codeEditor->editor();
@@ -915,7 +904,6 @@ void MainWindow::showCodeEditorConfig()
     }
 }
 
-
 void MainWindow::runToolPlugin()
 {
     QAction *action = qobject_cast<QAction *> (sender());
@@ -928,15 +916,11 @@ void MainWindow::runToolPlugin()
     }
 }
 
-
-#ifdef USING_QTSCRIPT
-
 void MainWindow::executeScriptFull(const QString& text)
 {
     executeScript(MainWindow::Execute, text);
 }
 
-
 void MainWindow::executeScript(const MainWindow::ScriptMode mode, const QString& text)
 {
     Q_ASSERT(_outputWidget);
@@ -989,7 +973,6 @@ void MainWindow::executeScript(const MainWindow::ScriptMode mode, const QString&
     engine->disconnect(_outputWidget->consoleInterface());
 }
 
-
 void MainWindow::executeScriptOneStep(const QString& text)
 {
     Q_ASSERT(_outputWidget);
@@ -1034,10 +1017,6 @@ void MainWindow::debugScript()
     }
 }
 
-
-#endif
-
-
 void MainWindow::enableStopAction()
 {
     _stopScript->setEnabled(true);
[prev in list] [next in list] [prev in thread] [next in thread]