Skip to content

Commit

Permalink
adding public includes directory
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Zalevskiy <denis.zalevskiy@jolla.com>
  • Loading branch information
Denis Zalevskiy committed May 20, 2014
1 parent be0c83d commit 2550cea
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 37 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -41,7 +41,7 @@ set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -gdwarf-3"
)

include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src)
add_subdirectory(src)
add_subdirectory(examples)
add_subdirectory(tests)
Expand Down
File renamed without changes.
9 changes: 3 additions & 6 deletions src/unit.hpp → include/vault/unit.hpp
@@ -1,13 +1,10 @@
#ifndef _CUTES_UNIT_HPP_
#define _CUTES_UNIT_HPP_

#include "util.hpp"
#include "os.hpp"
#include "vault_config.hpp"
#include "json.hpp"
#include "sys.hpp"
#include <vault/config.hpp>
#include <memory>

#include <cor/options.hpp>
namespace sys { class GetOpt; }

namespace vault { namespace unit {

Expand Down
10 changes: 5 additions & 5 deletions src/vault.hpp → include/vault/vault.hpp
@@ -1,14 +1,13 @@

#ifndef VAULT_H
#define VAULT_H
#ifndef _VAULT_VAULT_HPP_
#define _VAULT_VAULT_HPP_

#include <functional>

#include <QString>

#include <libgit/repo.hpp>

#include <vault_config.hpp>
#include <vault/config.hpp>

namespace vault {

Expand Down Expand Up @@ -85,4 +84,5 @@ class Vault

}

#endif
#endif // _VAULT_VAULT_HPP_

11 changes: 5 additions & 6 deletions qml/Vault/vault.cpp
@@ -1,9 +1,8 @@

#include "src/os.hpp"
#include "src/debug.hpp"
#include "src/vault.hpp"
#include "src/vault_config.hpp"
#include "transfer.hpp"
#include <os.hpp>
#include <debug.hpp>
#include <vault/vault.hpp>
#include <vault/config.hpp>
#include <transfer.hpp>

#include "vault.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/transfer.cpp
Expand Up @@ -4,7 +4,7 @@
#include "subprocess.hpp"
#include "debug.hpp"
#include "error.hpp"
#include "vault.hpp"
#include <vault/vault.hpp>

#include "QString"
#include "QVariant"
Expand Down
6 changes: 5 additions & 1 deletion src/unit.cpp
@@ -1,4 +1,8 @@
#include "unit.hpp"
#include <vault/unit.hpp>

#include "util.hpp"
#include "os.hpp"
#include "json.hpp"
#include "debug.hpp"

#include <QString>
Expand Down
2 changes: 1 addition & 1 deletion src/vault-cli.cpp
Expand Up @@ -3,7 +3,7 @@
#include <QCommandLineParser>
#include <QDebug>

#include "vault.hpp"
#include <vault/vault.hpp>

int main(int argc, char **argv)
{
Expand Down
20 changes: 10 additions & 10 deletions src/vault.cpp
@@ -1,19 +1,19 @@
#include <vault/vault.hpp>

#include <QFile>
#include <QTextStream>
#include <QDebug>
#include <QDateTime>
#include <QDir>
#include "os.hpp"
#include "error.hpp"
#include "debug.hpp"
#include "subprocess.hpp"

#include <libgit/commit.hpp>
#include <libgit/branch.hpp>
#include <libgit/repostatus.hpp>

#include "vault.hpp"
#include "os.hpp"
#include "error.hpp"
#include "debug.hpp"
#include "subprocess.hpp"
#include <QFile>
#include <QTextStream>
#include <QDebug>
#include <QDateTime>
#include <QDir>

namespace vault {

Expand Down
2 changes: 1 addition & 1 deletion src/vault_config.cpp
Expand Up @@ -5,7 +5,7 @@
#include <libgit/repostatus.hpp>
#include <libgit/commit.hpp>

#include "vault_config.hpp"
#include <vault/config.hpp>
#include "error.hpp"
#include "os.hpp"
#include "debug.hpp"
Expand Down
5 changes: 3 additions & 2 deletions tests/unit1_vault_test.cpp
@@ -1,5 +1,6 @@

#include "unit.hpp"
#include <vault/unit.hpp>

#include "os.hpp"
#include "subprocess.hpp"
#include "error.hpp"
Expand All @@ -26,4 +27,4 @@ int main(int argc, char *argv[])
qDebug() << e.what();
}
return 0;
}
}
9 changes: 6 additions & 3 deletions tests/unit_all.cpp
@@ -1,6 +1,9 @@
#include "unit.hpp"
#include "util.hpp"
#include "error.hpp"
#include <vault/unit.hpp>

#include <util.hpp>
#include <sys.hpp>
#include <error.hpp>

#include <QCoreApplication>
#include <QDebug>

Expand Down

0 comments on commit 2550cea

Please sign in to comment.