From afd5ef2e3d251f2d9a19e94a8e903b08904acad7 Mon Sep 17 00:00:00 2001
From: Martin Kampas <martin.kampas@tieto.com>
Date: Thu, 4 Apr 2013 11:22:15 +0200
Subject: [PATCH] Move SandboxFileEngineHandler from tests to libssu

---
 libssu/libssu.pro                                           | 2 ++
 {tests/testutils => libssu}/sandboxfileenginehandler.cpp    | 2 +-
 .../sandboxfileenginehandler_p.h                            | 6 +++---
 tests/testutils/sandboxhook.cpp                             | 2 +-
 tests/testutils/sandboxhook_dependencies.pri                | 2 +-
 tests/testutils/testutils.pro                               | 2 --
 tests/ut_urlresolver/main.cpp                               | 2 +-
 tests/ut_urlresolver/ut_urlresolver_dependencies.pri        | 1 -
 8 files changed, 9 insertions(+), 10 deletions(-)
 rename {tests/testutils => libssu}/sandboxfileenginehandler.cpp (98%)
 rename tests/testutils/sandboxfileenginehandler.h => libssu/sandboxfileenginehandler_p.h (73%)

diff --git a/libssu/libssu.pro b/libssu/libssu.pro
index 9fdde0c..67c99dd 100644
--- a/libssu/libssu.pro
+++ b/libssu/libssu.pro
@@ -7,6 +7,7 @@ public_headers = \
 
 HEADERS = \
         $${public_headers} \
+        sandboxfileenginehandler_p.h \
         ssucoreconfig.h \
         ssudeviceinfo.h \
         ssulog.h \
@@ -15,6 +16,7 @@ HEADERS = \
         ssurepomanager.h \
 
 SOURCES = \
+        sandboxfileenginehandler.cpp \
         ssu.cpp \
         ssucoreconfig.cpp \
         ssudeviceinfo.cpp \
diff --git a/tests/testutils/sandboxfileenginehandler.cpp b/libssu/sandboxfileenginehandler.cpp
similarity index 98%
rename from tests/testutils/sandboxfileenginehandler.cpp
rename to libssu/sandboxfileenginehandler.cpp
index f72ff1d..3c26f80 100644
--- a/tests/testutils/sandboxfileenginehandler.cpp
+++ b/libssu/sandboxfileenginehandler.cpp
@@ -5,7 +5,7 @@
  * @date 2013
  */
 
-#include "sandboxfileenginehandler.h"
+#include "sandboxfileenginehandler_p.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QFSFileEngine>
diff --git a/tests/testutils/sandboxfileenginehandler.h b/libssu/sandboxfileenginehandler_p.h
similarity index 73%
rename from tests/testutils/sandboxfileenginehandler.h
rename to libssu/sandboxfileenginehandler_p.h
index 4888773..1dbabe6 100644
--- a/tests/testutils/sandboxfileenginehandler.h
+++ b/libssu/sandboxfileenginehandler_p.h
@@ -1,12 +1,12 @@
 /**
- * @file sandboxfileenginehandler.h
+ * @file sandboxfileenginehandler_p.h
  * @copyright 2013 Jolla Ltd.
  * @author Martin Kampas <martin.kampas@tieto.com>
  * @date 2013
  */
 
-#ifndef _SANDBOXINGFILEENGINEHANDLER_H
-#define _SANDBOXINGFILEENGINEHANDLER_H
+#ifndef _SANDBOXINGFILEENGINEHANDLER_P_H
+#define _SANDBOXINGFILEENGINEHANDLER_P_H
 
 #include <QtCore/QAbstractFileEngineHandler>
 
diff --git a/tests/testutils/sandboxhook.cpp b/tests/testutils/sandboxhook.cpp
index 7a9423c..5d9e9aa 100644
--- a/tests/testutils/sandboxhook.cpp
+++ b/tests/testutils/sandboxhook.cpp
@@ -1,6 +1,6 @@
 #include <dlfcn.h>
 
-#include "sandboxfileenginehandler.h"
+#include "libssu/sandboxfileenginehandler_p.h"
 
 extern "C" void qt_startup_hook()
 {
diff --git a/tests/testutils/sandboxhook_dependencies.pri b/tests/testutils/sandboxhook_dependencies.pri
index dbc309b..37c741f 100644
--- a/tests/testutils/sandboxhook_dependencies.pri
+++ b/tests/testutils/sandboxhook_dependencies.pri
@@ -1 +1 @@
-include(../testutils/testutils.pri)
+include(../../libssu/libssu.pri)
diff --git a/tests/testutils/testutils.pro b/tests/testutils/testutils.pro
index 8db17a1..42ff951 100644
--- a/tests/testutils/testutils.pro
+++ b/tests/testutils/testutils.pro
@@ -3,11 +3,9 @@ include(../testlibrary.pri)
 
 HEADERS = \
         process.h \
-        sandboxfileenginehandler.h \
 
 SOURCES = \
         process.cpp \
-        sandboxfileenginehandler.cpp \
 
 exec_wrapper.path = $$TESTS_PATH
 exec_wrapper.files = runtest.sh
diff --git a/tests/ut_urlresolver/main.cpp b/tests/ut_urlresolver/main.cpp
index 6bd2257..8077a7b 100644
--- a/tests/ut_urlresolver/main.cpp
+++ b/tests/ut_urlresolver/main.cpp
@@ -7,7 +7,7 @@
 
 #include <QtTest/QtTest>
 
-#include "testutils/sandboxfileenginehandler.h"
+#include "libssu/sandboxfileenginehandler_p.h"
 #include "urlresolvertest.cpp"
 
 int main(int argc, char **argv){
diff --git a/tests/ut_urlresolver/ut_urlresolver_dependencies.pri b/tests/ut_urlresolver/ut_urlresolver_dependencies.pri
index 5e56454..37c741f 100644
--- a/tests/ut_urlresolver/ut_urlresolver_dependencies.pri
+++ b/tests/ut_urlresolver/ut_urlresolver_dependencies.pri
@@ -1,2 +1 @@
 include(../../libssu/libssu.pri)
-include(../testutils/testutils.pri)