Cleanup.

Author: sletz

src/MainStructure/FLSessionManager.cpp

@@ -618,7 +618,7 @@ const char** FLSessionManager::getFactoryArgv(const QString& sourcePath, const Q
             FLSettings::_Instance()->value("General/Control/PolyphonyGroupDefaultChecked", false)).toBool()) ? "1": "0";
     }
 
-    argv[argc] = 0; // NULL terminated argv
+    argv[argc] = NULL; // NULL terminated argv
     return argv;
 }
 

src/MainStructure/FLWindow.cpp

@@ -910,7 +910,7 @@ void FLWindow::allocateOscInterface()
     string errport = fSettings->value("Osc/ErrPort", "5512").toString().toStdString();
     argv[10] = (char*) (errport.c_str());
 
-    argv[argc] = 0; // NULL terminated argv
+    argv[argc] = NULL; // NULL terminated argv
 
     fOscInterface = new OSCUI(argv[0], argc, argv, NULL, &catch_OSCError, this, false);
     delete [] argv;

src/MenusAndDialogs/FLHelpWindow.cpp

@@ -10,6 +10,8 @@
 #include "utilities.h"
 #include "FLErrorWindow.h"
 
+#include <iostream>
+
 #define LLVM_DSP_FACTORY
 #ifdef LLVM_DSP_FACTORY
 #include "faust/dsp/llvm-dsp.h"
@@ -165,7 +167,7 @@ void FLHelpWindow::parseLibs(map<string, vector<pair<string, string> > >& infoLi
     //The library path is where libraries like the scheduler architecture file are = currentSession
     string libPath = fLibsFolder.toStdString();
     argv[argc++] = libPath.c_str();
-    argv[argc] = 0; // NULL terminated argv
+    argv[argc] = NULL; // NULL terminated argv
     string error;
     string file = fTestDSPPath.toStdString();
 
@@ -174,6 +176,7 @@ void FLHelpWindow::parseLibs(map<string, vector<pair<string, string> > >& infoLi
 #else
     dsp_factory* temp_factory = createInterpreterDSPFactoryFromFile(file, argc, argv, error);
 #endif
+ 
     if (!temp_factory) {
         FLErrorWindow::_Instance()->print_Error(error.c_str());
         return;
@@ -184,7 +187,7 @@ void FLHelpWindow::parseLibs(map<string, vector<pair<string, string> > >& infoLi
 
         MyMeta* meta = new MyMeta;
         temp_dsp->metadata(meta);
-
+       
         for (size_t i = 0; i < meta->datas.size(); i++) {
 
             string libName, key, value;
@@ -196,7 +199,7 @@ void FLHelpWindow::parseLibs(map<string, vector<pair<string, string> > >& infoLi
             } else {
                 key = meta->datas[i].first;
             }
-
+            
             value = meta->datas[i].second;
             infoLibs[libName].push_back(make_pair(key, value));
         }

src/MenusAndDialogs/FLHelpWindow.h

@@ -33,17 +33,18 @@
 
 using namespace std;
 
-struct MyMeta: public Meta{
+struct MyMeta: public Meta {
 
     public:
     vector<pair<string, string> > datas;
 
-    virtual void declare(const char* key, const char* value){
+    virtual void declare(const char* key, const char* value)
+    {
         datas.push_back(make_pair(key, value));
     }
 };
 
-class FLHelpWindow : public QMainWindow{
+class FLHelpWindow : public QMainWindow {
 
     private:
 
@@ -66,23 +67,23 @@ class FLHelpWindow : public QMainWindow{
         FLHelpWindow(const QString& libsFodler, const QString& testDSPPath);
         virtual ~FLHelpWindow();
 
-        static  FLHelpWindow*   _helpWindow;
-        static  FLHelpWindow*   _Instance();
-        static  void            createInstance(const QString home, const QString& testDSPPath);
-        static  void            deleteInstance();
+        static FLHelpWindow* _helpWindow;
+        static FLHelpWindow* _Instance();
+        static void createInstance(const QString home, const QString& testDSPPath);
+        static void deleteInstance();
 
         void init();
 
         virtual void closeEvent(QCloseEvent* event);
 
     public slots:
 
-        void    setToolText(const QString & currentText);
-        void    setAppPropertiesText(const QString& currentText);  
-        void    setWinPropertiesText(const QString& currentText);
-        void    setLibText();
+        void setToolText(const QString & currentText);
+        void setAppPropertiesText(const QString& currentText);
+        void setWinPropertiesText(const QString& currentText);
+        void setLibText();
 
-        void    hideWindow();
+        void hideWindow();
 
 };
 

src/Network/unused/FLRemoteServer.cpp

@@ -501,7 +501,7 @@ bool Server::compile_Data(connection_info_struct* con_info){
         for(int i = 0; i < argc; i++){
             argv[i] = (con_info->fCompilationOptions[i]).c_str();
         }
-        argv[argc] = 0; // NULL terminated argv
+        argv[argc] = NULL; // NULL terminated argv
 
         string error;
         con_info->fLLVMFactory = createDSPFactoryFromString(con_info->fNameApp, con_info->fFaustCode, argc, argv, "", error, atoi(con_info->fOptLevel.c_str()));