C++ modules fixing (PatchCanvas)

c++/patchcanvas.cpp

@@ -0,0 +1,30 @@
+/*
+ * Patchbay Canvas engine using QGraphicsView/Scene
+ * Copyright (C) 2010-2012 Filipe Coelho <falktx@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * For a full copy of the GNU General Public License see the COPYING file
+ */
+
+#include "patchcanvas/patchcanvas.cpp"
+#include "patchcanvas/patchcanvas-theme.cpp"
+#include "patchcanvas/patchscene.cpp"
+#include "patchcanvas/canvasbezierline.cpp"
+#include "patchcanvas/canvasbezierlinemov.cpp"
+#include "patchcanvas/canvasbox.cpp"
+#include "patchcanvas/canvasboxshadow.cpp"
+#include "patchcanvas/canvasfadeanimation.cpp"
+#include "patchcanvas/canvasicon.cpp"
+#include "patchcanvas/canvasline.cpp"
+#include "patchcanvas/canvaslinemov.cpp"
+#include "patchcanvas/canvasport.cpp"
+#include "patchcanvas/canvasportglow.cpp"

c++/patchcanvas/patchcanvas-api.h → c++/patchcanvas.h

@@ -25,10 +25,8 @@
 #define PATCHCANVAS_ORGANISATION_NAME "PatchCanvas"
 #endif
 
-#include <QtCore/QString>
-
-#include "patchcanvas-theme.h"
-#include "patchscene.h"
+#include "patchcanvas/patchcanvas-theme.h"
+#include "patchcanvas/patchscene.h"
 
 START_NAMESPACE_PATCHCANVAS
 
@@ -130,6 +128,11 @@ void disconnectPorts(int connection_id);
 void arrange();
 void updateZValues();
 
+// Theme
+Theme::List getDefaultTheme();
+QString getThemeName(Theme::List id);
+QString getDefaultThemeName();
+
 END_NAMESPACE_PATCHCANVAS
 
 #endif // PATCHCANVAS_API_H

c++/patchcanvas/PatchCanvas.pro

@@ -1,47 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2011-10-17T21:44:58
-#
-#-------------------------------------------------
-
-QT       = core gui svg opengl
-TEMPLATE = app
-CONFIG  += debug
-
-TARGET = PatchCanvas
-
-SOURCES = main.cpp canvastestapp.cpp \
-    patchcanvas.cpp \
-    patchcanvas-theme.cpp \
-    patchscene.cpp \
-    canvasfadeanimation.cpp \
-    canvasline.cpp \
-    canvasbezierline.cpp \
-    canvaslinemov.cpp \
-    canvasbezierlinemov.cpp \
-    canvasport.cpp \
-    canvasbox.cpp \
-    canvasicon.cpp \
-    canvasboxshadow.cpp \
-    canvasportglow.cpp
-
-HEADERS = canvastestapp.h \
-    patchcanvas.h \
-    patchcanvas-api.h \
-    patchcanvas-theme.h \
-    patchscene.h \
-    canvasfadeanimation.h \
-    abstractcanvasline.h \
-    canvasline.h \
-    canvasbezierline.h \
-    canvaslinemov.h \
-    canvasbezierlinemov.h \
-    canvasport.h \
-    canvasbox.h \
-    canvasicon.h \
-    canvasboxshadow.h \
-    canvasportglow.h
-
-FORMS = canvastestapp.ui
-
-LIBS = -ljack

c++/patchcanvas/main.cpp

@@ -1,11 +0,0 @@
-#include <QtGui/QApplication>
-#include "canvastestapp.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication a(argc, argv);
-    CanvasTestApp w;
-    w.show();
-
-    return a.exec();
-}

c++/patchcanvas/patchcanvas-theme.h

@@ -22,7 +22,7 @@
 #include <QtGui/QFont>
 #include <QtGui/QPen>
 
-#include "patchcanvas-api.h"
+#include "../patchcanvas.h"
 
 START_NAMESPACE_PATCHCANVAS
 
@@ -97,10 +97,6 @@ public:
     QColor rubberband_brush;
 };
 
-Theme::List getDefaultTheme();
-QString getThemeName(Theme::List id);
-QString getDefaultThemeName();
-
 END_NAMESPACE_PATCHCANVAS
 
 #endif // PATCHCANVAS_THEME_H

c++/patchcanvas/patchcanvas.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "patchcanvas.h"
+#include "patchscene.h"
 
 #include <QtCore/QSettings>
 #include <QtCore/QTimer>

c++/patchcanvas/patchcanvas.h

@@ -20,7 +20,7 @@
 
 #include <QtGui/QGraphicsItem>
 
-#include "patchcanvas-api.h"
+#include "../patchcanvas.h"
 
 #define foreach2(var, list) \
     for (int i=0; i < list.count(); i++) { var = list[i];

c++/patchcanvas/patchscene.cpp

@@ -24,8 +24,8 @@
 #include <QtGui/QGraphicsSceneWheelEvent>
 #include <QtGui/QGraphicsView>
 
-#include "patchcanvas.h"
-#include "canvasbox.h"
+#include "patchcanvas/patchcanvas.h"
+#include "patchcanvas/canvasbox.h"
 
 using namespace PatchCanvas;
 

c++/patchcanvas/canvastestapp.cpp → c++/tests/canvastestapp.cpp

@@ -1,3 +1,7 @@
+/*
+ * PatchCanvas test app
+ */
+
 #include "canvastestapp.h"
 #include "ui_canvastestapp.h"
 
@@ -403,3 +407,16 @@ void CanvasTestApp::closeEvent(QCloseEvent* event)
 
     QMainWindow::closeEvent(event);
 }
+
+// -------------------------------------------------------------------------------------------------------
+
+#include <QtGui/QApplication>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    CanvasTestApp w;
+    w.show();
+
+    return a.exec();
+}

c++/patchcanvas/canvastestapp.h → c++/tests/canvastestapp.h

@@ -9,7 +9,7 @@
 
 #include <jack/jack.h>
 
-#include "patchcanvas-api.h"
+#include "patchcanvas.h"
 
 namespace Ui {
     class CanvasTestApp;

c++/tests/canvastestapp.pro

@@ -0,0 +1,27 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2011-10-17T21:44:58
+#
+#-------------------------------------------------
+
+QT       = core gui svg opengl
+TEMPLATE = app
+CONFIG  += debug
+
+TARGET = CanvasTestApp
+
+SOURCES = \
+    canvastestapp.cpp \
+    ../patchcanvas.cpp
+
+HEADERS = \
+    canvastestapp.h \
+    ../patchcanvas.h \
+    ../patchcanvas/patchcanvas.h \
+    ../patchcanvas/patchscene.h
+
+INCLUDEPATH = ..
+
+FORMS = canvastestapp.ui
+
+LIBS = -ljack