From b34f940e78716244da21a6b8f182c1bd2a16480d Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 23 Jul 2012 02:54:59 +0100 Subject: [PATCH] C++ modules fixing (PatchCanvas) --- c++/patchcanvas.cpp | 30 ++++++++++++ .../patchcanvas-api.h => patchcanvas.h} | 11 +++-- c++/patchcanvas/PatchCanvas.pro | 47 ------------------- c++/patchcanvas/main.cpp | 11 ----- c++/patchcanvas/patchcanvas-theme.h | 6 +-- c++/patchcanvas/patchcanvas.cpp | 1 + c++/patchcanvas/patchcanvas.h | 2 +- c++/patchcanvas/patchscene.cpp | 4 +- c++/{patchcanvas => tests}/canvastestapp.cpp | 17 +++++++ c++/{patchcanvas => tests}/canvastestapp.h | 2 +- c++/tests/canvastestapp.pro | 27 +++++++++++ c++/{patchcanvas => tests}/canvastestapp.ui | 0 12 files changed, 87 insertions(+), 71 deletions(-) create mode 100644 c++/patchcanvas.cpp rename c++/{patchcanvas/patchcanvas-api.h => patchcanvas.h} (95%) delete mode 100644 c++/patchcanvas/PatchCanvas.pro delete mode 100644 c++/patchcanvas/main.cpp rename c++/{patchcanvas => tests}/canvastestapp.cpp (97%) rename c++/{patchcanvas => tests}/canvastestapp.h (97%) create mode 100644 c++/tests/canvastestapp.pro rename c++/{patchcanvas => tests}/canvastestapp.ui (100%) diff --git a/c++/patchcanvas.cpp b/c++/patchcanvas.cpp new file mode 100644 index 0000000..c23d499 --- /dev/null +++ b/c++/patchcanvas.cpp @@ -0,0 +1,30 @@ +/* + * Patchbay Canvas engine using QGraphicsView/Scene + * Copyright (C) 2010-2012 Filipe Coelho + * + * 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" diff --git a/c++/patchcanvas/patchcanvas-api.h b/c++/patchcanvas.h similarity index 95% rename from c++/patchcanvas/patchcanvas-api.h rename to c++/patchcanvas.h index e21da1f..1ea9282 100644 --- a/c++/patchcanvas/patchcanvas-api.h +++ b/c++/patchcanvas.h @@ -25,10 +25,8 @@ #define PATCHCANVAS_ORGANISATION_NAME "PatchCanvas" #endif -#include - -#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 diff --git a/c++/patchcanvas/PatchCanvas.pro b/c++/patchcanvas/PatchCanvas.pro deleted file mode 100644 index 9cf0867..0000000 --- a/c++/patchcanvas/PatchCanvas.pro +++ /dev/null @@ -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 diff --git a/c++/patchcanvas/main.cpp b/c++/patchcanvas/main.cpp deleted file mode 100644 index 94d25b2..0000000 --- a/c++/patchcanvas/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include "canvastestapp.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - CanvasTestApp w; - w.show(); - - return a.exec(); -} diff --git a/c++/patchcanvas/patchcanvas-theme.h b/c++/patchcanvas/patchcanvas-theme.h index 2bed0a1..864ecc0 100644 --- a/c++/patchcanvas/patchcanvas-theme.h +++ b/c++/patchcanvas/patchcanvas-theme.h @@ -22,7 +22,7 @@ #include #include -#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 diff --git a/c++/patchcanvas/patchcanvas.cpp b/c++/patchcanvas/patchcanvas.cpp index 5a2a6c9..79ba224 100644 --- a/c++/patchcanvas/patchcanvas.cpp +++ b/c++/patchcanvas/patchcanvas.cpp @@ -16,6 +16,7 @@ */ #include "patchcanvas.h" +#include "patchscene.h" #include #include diff --git a/c++/patchcanvas/patchcanvas.h b/c++/patchcanvas/patchcanvas.h index f0ff8d4..af76530 100644 --- a/c++/patchcanvas/patchcanvas.h +++ b/c++/patchcanvas/patchcanvas.h @@ -20,7 +20,7 @@ #include -#include "patchcanvas-api.h" +#include "../patchcanvas.h" #define foreach2(var, list) \ for (int i=0; i < list.count(); i++) { var = list[i]; diff --git a/c++/patchcanvas/patchscene.cpp b/c++/patchcanvas/patchscene.cpp index d8cb0ad..ac7097c 100644 --- a/c++/patchcanvas/patchscene.cpp +++ b/c++/patchcanvas/patchscene.cpp @@ -24,8 +24,8 @@ #include #include -#include "patchcanvas.h" -#include "canvasbox.h" +#include "patchcanvas/patchcanvas.h" +#include "patchcanvas/canvasbox.h" using namespace PatchCanvas; diff --git a/c++/patchcanvas/canvastestapp.cpp b/c++/tests/canvastestapp.cpp similarity index 97% rename from c++/patchcanvas/canvastestapp.cpp rename to c++/tests/canvastestapp.cpp index db98fd6..c7fe10d 100644 --- a/c++/patchcanvas/canvastestapp.cpp +++ b/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 + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + CanvasTestApp w; + w.show(); + + return a.exec(); +} diff --git a/c++/patchcanvas/canvastestapp.h b/c++/tests/canvastestapp.h similarity index 97% rename from c++/patchcanvas/canvastestapp.h rename to c++/tests/canvastestapp.h index 6e8bbae..8cba886 100644 --- a/c++/patchcanvas/canvastestapp.h +++ b/c++/tests/canvastestapp.h @@ -9,7 +9,7 @@ #include -#include "patchcanvas-api.h" +#include "patchcanvas.h" namespace Ui { class CanvasTestApp; diff --git a/c++/tests/canvastestapp.pro b/c++/tests/canvastestapp.pro new file mode 100644 index 0000000..345b7b0 --- /dev/null +++ b/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 diff --git a/c++/patchcanvas/canvastestapp.ui b/c++/tests/canvastestapp.ui similarity index 100% rename from c++/patchcanvas/canvastestapp.ui rename to c++/tests/canvastestapp.ui