summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/AlsaDriver.cpp14
-rw-r--r--src/AlsaDriver.hpp (renamed from src/AlsaDriver.h)2
-rw-r--r--src/Driver.hpp (renamed from src/Driver.h)4
-rw-r--r--src/JackDriver.cpp18
-rw-r--r--src/JackDriver.hpp (renamed from src/JackDriver.h)7
-rw-r--r--src/JackSettingsDialog.hpp (renamed from src/JackSettingsDialog.h)0
-rw-r--r--src/LashDriver.cpp11
-rw-r--r--src/LashDriver.hpp (renamed from src/LashDriver.h)4
-rw-r--r--src/Patchage.cpp18
-rw-r--r--src/Patchage.hpp (renamed from src/Patchage.h)0
-rw-r--r--src/PatchageCanvas.cpp16
-rw-r--r--src/PatchageCanvas.hpp (renamed from src/PatchageCanvas.h)4
-rw-r--r--src/PatchageEvent.cpp12
-rw-r--r--src/PatchageEvent.hpp (renamed from src/PatchageEvent.h)3
-rw-r--r--src/PatchageModule.hpp (renamed from src/PatchageModule.h)10
-rw-r--r--src/PatchagePort.hpp (renamed from src/PatchagePort.h)7
-rw-r--r--src/StateManager.cpp7
-rw-r--r--src/StateManager.hpp (renamed from src/StateManager.h)2
-rw-r--r--src/main.cpp6
19 files changed, 68 insertions, 77 deletions
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 6a07487..058b0a1 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -18,15 +18,13 @@
#include <string>
#include <iostream>
#include <cassert>
-#include "PatchageCanvas.h"
-#include "AlsaDriver.h"
-#include "Patchage.h"
-#include "PatchageModule.h"
-#include "PatchagePort.h"
-
-using std::cerr;
-using std::string;
+#include "PatchageCanvas.hpp"
+#include "AlsaDriver.hpp"
+#include "Patchage.hpp"
+#include "PatchageModule.hpp"
+#include "PatchagePort.hpp"
+using namespace std;
using namespace FlowCanvas;
AlsaDriver::AlsaDriver(Patchage* app)
diff --git a/src/AlsaDriver.h b/src/AlsaDriver.hpp
index 2408d9d..d251d78 100644
--- a/src/AlsaDriver.h
+++ b/src/AlsaDriver.hpp
@@ -23,7 +23,7 @@
#include <pthread.h>
#include <queue>
#include <string>
-#include "Driver.h"
+#include "Driver.hpp"
class Patchage;
class PatchagePort;
class PatchageFlowCanvas;
diff --git a/src/Driver.h b/src/Driver.hpp
index 7feb8ca..5d0c59d 100644
--- a/src/Driver.h
+++ b/src/Driver.hpp
@@ -20,8 +20,8 @@
#include <boost/shared_ptr.hpp>
#include <sigc++/sigc++.h>
-#include <raul/SRSWQueue.h>
-#include "PatchageEvent.h"
+#include <raul/SRSWQueue.hpp>
+#include "PatchageEvent.hpp"
class PatchagePort;
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 4513830..e088590 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -23,16 +23,14 @@
#include <jack/jack.h>
#include <jack/statistics.h>
#include <jack/thread.h>
-#include <raul/SharedPtr.h>
-#include "PatchageCanvas.h"
-#include "PatchageEvent.h"
-#include "JackDriver.h"
-#include "Patchage.h"
-#include "PatchageModule.h"
-
-using std::cerr; using std::endl;
-using std::string;
-
+#include <raul/SharedPtr.hpp>
+#include "PatchageCanvas.hpp"
+#include "PatchageEvent.hpp"
+#include "JackDriver.hpp"
+#include "Patchage.hpp"
+#include "PatchageModule.hpp"
+
+using namespace std;
using namespace FlowCanvas;
diff --git a/src/JackDriver.h b/src/JackDriver.hpp
index 1c03972..b66e4ee 100644
--- a/src/JackDriver.h
+++ b/src/JackDriver.hpp
@@ -19,21 +19,18 @@
#define JACKDRIVER_H
#include <iostream>
-#include <string>
#include <boost/shared_ptr.hpp>
#include <jack/jack.h>
#include <jack/statistics.h>
#include <glibmm/thread.h>
-#include "raul/AtomicPtr.h"
-#include "Driver.h"
+#include <raul/AtomicPtr.hpp>
+#include "Driver.hpp"
class Patchage;
class PatchageEvent;
class PatchageFlowCanvas;
class PatchagePort;
class PatchageModule;
-using std::string;
-
/** Handles all externally driven functionality, registering ports etc.
*
diff --git a/src/JackSettingsDialog.h b/src/JackSettingsDialog.hpp
index 4900a60..4900a60 100644
--- a/src/JackSettingsDialog.h
+++ b/src/JackSettingsDialog.hpp
diff --git a/src/LashDriver.cpp b/src/LashDriver.cpp
index 114748b..5c58444 100644
--- a/src/LashDriver.cpp
+++ b/src/LashDriver.cpp
@@ -15,15 +15,14 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "LashDriver.h"
-#include "config.h"
#include <iostream>
#include <string>
-#include "Patchage.h"
-#include "StateManager.h"
+#include "../../config/config.h"
+#include "LashDriver.hpp"
+#include "Patchage.hpp"
+#include "StateManager.hpp"
-using std::cerr; using std::cout; using std::endl;
-using std::string;
+using namespace std;
LashDriver::LashDriver(Patchage* app, int argc, char** argv)
diff --git a/src/LashDriver.h b/src/LashDriver.hpp
index 0121509..225c72f 100644
--- a/src/LashDriver.h
+++ b/src/LashDriver.hpp
@@ -19,8 +19,8 @@
#define LASHDRIVER_H
#include <lash/lash.h>
-#include <raul/LashServerInterface.h>
-#include "Driver.h"
+#include <raul/LashServerInterface.hpp>
+#include "Driver.hpp"
class Patchage;
diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index b6e7f84..a21e578 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -17,27 +17,27 @@
#include <cmath>
#include <sstream>
-#include "Patchage.h"
-#include "PatchageEvent.h"
#include "../../config/config.h"
#include <libgnomecanvasmm.h>
#include <libglademm/xml.h>
#include <fstream>
#include <pthread.h>
-#include "StateManager.h"
-#include "PatchageCanvas.h"
#include <jack/statistics.h>
-#include "JackDriver.h"
-#include "JackSettingsDialog.h"
+#include "Patchage.hpp"
+#include "PatchageEvent.hpp"
+#include "StateManager.hpp"
+#include "PatchageCanvas.hpp"
+#include "JackDriver.hpp"
+#include "JackSettingsDialog.hpp"
#ifdef HAVE_LASH
-#include "LashDriver.h"
+#include "LashDriver.hpp"
#endif
#ifdef HAVE_ALSA
-#include "AlsaDriver.h"
+#include "AlsaDriver.hpp"
#endif
// FIXME: include to avoid undefined reference to boost SP debug hooks stuff
-#include <raul/SharedPtr.h>
+#include <raul/SharedPtr.hpp>
diff --git a/src/Patchage.h b/src/Patchage.hpp
index e4112ff..e4112ff 100644
--- a/src/Patchage.h
+++ b/src/Patchage.hpp
diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp
index 6c9e2c8..22b4d1f 100644
--- a/src/PatchageCanvas.cpp
+++ b/src/PatchageCanvas.cpp
@@ -15,15 +15,15 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <raul/SharedPtr.h>
-#include "config.h"
-#include "PatchageCanvas.h"
-#include "Patchage.h"
-#include "JackDriver.h"
-#include "PatchageModule.h"
-#include "PatchagePort.h"
+#include <raul/SharedPtr.hpp>
+#include "../../config/config.h"
+#include "PatchageCanvas.hpp"
+#include "Patchage.hpp"
+#include "JackDriver.hpp"
+#include "PatchageModule.hpp"
+#include "PatchagePort.hpp"
#ifdef HAVE_ALSA
-#include "AlsaDriver.h"
+#include "AlsaDriver.hpp"
#endif
PatchageCanvas::PatchageCanvas(Patchage* app, int width, int height)
diff --git a/src/PatchageCanvas.h b/src/PatchageCanvas.hpp
index 4ac5c62..fd662f1 100644
--- a/src/PatchageCanvas.h
+++ b/src/PatchageCanvas.hpp
@@ -23,8 +23,8 @@
#ifdef HAVE_ALSA
#include <alsa/asoundlib.h>
#endif
-#include <flowcanvas/Canvas.h>
-#include "StateManager.h"
+#include <flowcanvas/Canvas.hpp>
+#include "StateManager.hpp"
class Patchage;
class PatchageModule;
diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp
index 493050a..f996495 100644
--- a/src/PatchageEvent.cpp
+++ b/src/PatchageEvent.cpp
@@ -16,12 +16,12 @@
*/
#include "../../config/config.h"
-#include "raul/SharedPtr.h"
-#include "Patchage.h"
-#include "PatchageCanvas.h"
-#include "PatchageModule.h"
-#include "PatchageEvent.h"
-#include "JackDriver.h"
+#include <raul/SharedPtr.hpp>
+#include "Patchage.hpp"
+#include "PatchageCanvas.hpp"
+#include "PatchageModule.hpp"
+#include "PatchageEvent.hpp"
+#include "JackDriver.hpp"
SharedPtr<PatchagePort>
diff --git a/src/PatchageEvent.h b/src/PatchageEvent.hpp
index 24dd7ba..ada4718 100644
--- a/src/PatchageEvent.h
+++ b/src/PatchageEvent.hpp
@@ -18,13 +18,12 @@
#ifndef PATCHAGEEVENT_H
#define PATCHAGEEVENT_H
-#include <string>
#include <jack/jack.h>
#include "../../config/config.h"
#ifdef HAVE_ALSA
#include <alsa/asoundlib.h>
#endif
-#include "PatchagePort.h"
+#include "PatchagePort.hpp"
class Patchage;
diff --git a/src/PatchageModule.h b/src/PatchageModule.hpp
index 131c86a..244e7bf 100644
--- a/src/PatchageModule.h
+++ b/src/PatchageModule.hpp
@@ -23,11 +23,11 @@
#ifdef HAVE_ALSA
#include <alsa/asoundlib.h>
#endif
-#include <flowcanvas/Canvas.h>
-#include <flowcanvas/Module.h>
-#include "PatchageCanvas.h"
-#include "StateManager.h"
-#include "PatchagePort.h"
+#include <flowcanvas/Canvas.hpp>
+#include <flowcanvas/Module.hpp>
+#include "PatchageCanvas.hpp"
+#include "StateManager.hpp"
+#include "PatchagePort.hpp"
using std::string; using std::list;
diff --git a/src/PatchagePort.h b/src/PatchagePort.hpp
index 6109fba..52fe720 100644
--- a/src/PatchagePort.h
+++ b/src/PatchagePort.hpp
@@ -18,12 +18,13 @@
#ifndef PATCHAGEPORT_H
#define PATCHAGEPORT_H
-#include "config.h"
+#include "../../config/config.h"
#include <string>
#include <list>
-#include <flowcanvas/Port.h>
-#include <flowcanvas/Module.h>
#include <boost/shared_ptr.hpp>
+#include <flowcanvas/Port.hpp>
+#include <flowcanvas/Module.hpp>
+
#ifdef HAVE_ALSA
#include <alsa/asoundlib.h>
diff --git a/src/StateManager.cpp b/src/StateManager.cpp
index 8ed3ac8..22fdb9a 100644
--- a/src/StateManager.cpp
+++ b/src/StateManager.cpp
@@ -15,15 +15,14 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "StateManager.h"
#include <stdexcept>
#include <stdlib.h>
#include <iostream>
#include <fstream>
-#include "Patchage.h"
+#include "StateManager.hpp"
+#include "Patchage.hpp"
-using std::map; using std::list;
-using std::cerr; using std::cout; using std::endl;
+using namespace std;
StateManager::StateManager()
diff --git a/src/StateManager.h b/src/StateManager.hpp
index d7065dd..af89944 100644
--- a/src/StateManager.h
+++ b/src/StateManager.hpp
@@ -22,7 +22,7 @@
#include <list>
#include <map>
#include <iostream>
-#include "PatchagePort.h"
+#include "PatchagePort.hpp"
using std::string; using std::list; using std::map;
diff --git a/src/main.cpp b/src/main.cpp
index c17e3e0..b7bfc36 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,14 +15,14 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
+#include "../../config/config.h"
#include <iostream>
#include <libgnomecanvasmm.h>
#include <glibmm/exception.h>
-#include "Patchage.h"
-#include "JackDriver.h"
+#include "Patchage.hpp"
+#include "JackDriver.hpp"
#ifdef HAVE_LASH
#include <lash/lash.h>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 06:24:50 +0000