diff options
author | Philippe Lelong <lelong.ph@meltemus.com> | 2016-12-14 17:08:53 +0100 |
---|---|---|
committer | Philippe Lelong <lelong.ph@meltemus.com> | 2016-12-14 17:08:53 +0100 |
commit | cb31b34dbea210a8890004fd59dea3139b00be6c (patch) | |
tree | 40eed6a6b9035317c6c23be4b6901c48d2ed8260 /WindowManager | |
parent | 197b9dbe4c65c8bea7737215d9566199ba701730 (diff) |
add visa, start websocket implementationsandbox/maitai/wip
Signed-off-by: Philippe Lelong <lelong.ph@meltemus.com>
Diffstat (limited to 'WindowManager')
-rw-r--r-- | WindowManager/WindowManager.pro | 2 | ||||
-rw-r--r-- | WindowManager/src/windowmanager.cpp | 4 | ||||
-rw-r--r-- | WindowManager/src/windowmanager.hpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/WindowManager/WindowManager.pro b/WindowManager/WindowManager.pro index 5aa7320..335693f 100644 --- a/WindowManager/WindowManager.pro +++ b/WindowManager/WindowManager.pro @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +#DEFINES += COMPIL_MAITAI TEMPLATE = app TARGET = WindowManager QT = core dbus diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp index e21e5e1..fcd92a4 100644 --- a/WindowManager/src/windowmanager.cpp +++ b/WindowManager/src/windowmanager.cpp @@ -109,7 +109,7 @@ WindowManager::~WindowManager() #endif delete mp_layoutAreaToSurfaceIdAssignment; } -/* maitai +#ifndef COMPIL_MAITAI int WindowManager::getLayerRenderOrder(t_ilm_layer id_array[]) { int i, j; @@ -122,7 +122,7 @@ int WindowManager::getLayerRenderOrder(t_ilm_layer id_array[]) return j; } -*/ +#endif void WindowManager::dumpScene() { qDebug("\n"); diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp index d9ec68c..b0bbb3c 100644 --- a/WindowManager/src/windowmanager.hpp +++ b/WindowManager/src/windowmanager.hpp @@ -50,9 +50,9 @@ private: unsigned int m_screenHeight; int* m_showLayers; - /* maitai +#ifndef COMPIL_MAITAI int getLayerRenderOrder(t_ilm_layer id_array[]); - */ +#endif void dumpScene(); |