Skip to content

Commit

Permalink
Merge pull request #36 from Kicer86/cleanups
Browse files Browse the repository at this point in the history
Docs and code cleanup
  • Loading branch information
Kicer86 authored Dec 9, 2023
2 parents 934f3f7 + a6533d2 commit 15548d3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)

include(GenerateExportHeader)

option(CppRestAPI_QtBackend "Qt backend for GitHubApi" OFF)
option(CppRestAPI_CurlBackend "libcurl backend for GitHubApi" OFF)
option(CppRestAPI_Tests "Enable GitHubApi tests. Forces both CppRestAPI_QtBackend and CppRestAPI_CurlBackend to be ON" OFF)
option(CppRestAPI_QtBackend "Qt backend for CppRestAPI" OFF)
option(CppRestAPI_CurlBackend "libcurl backend for CppRestAPI" OFF)
option(CppRestAPI_Tests "Enable CppRestAPI tests. Forces both CppRestAPI_QtBackend and CppRestAPI_CurlBackend to be ON" OFF)

if(CppRestAPI_Tests)
set(CppRestAPI_QtBackend ON)
Expand Down
7 changes: 3 additions & 4 deletions include/cpp_restapi/curl_connection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "cpp_restapi_export.h"


namespace cpp_restapi { namespace CurlBackend {

namespace cpp_restapi::CurlBackend
{
class CPP_RESTAPI_EXPORT Connection: public BaseConnection
{
public:
Expand All @@ -20,7 +20,6 @@ namespace cpp_restapi { namespace CurlBackend {

std::pair<std::string, std::string> fetchPage(const std::string& request) override;
};

}}
}

#endif
7 changes: 3 additions & 4 deletions include/cpp_restapi/qt_connection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

class QNetworkAccessManager;

namespace cpp_restapi { namespace QtBackend {

namespace cpp_restapi::QtBackend
{
class CPP_RESTAPI_EXPORT Connection: public QObject, public BaseConnection
{
public:
Expand All @@ -31,7 +31,6 @@ namespace cpp_restapi { namespace QtBackend {

QNetworkRequest prepareRequest();
};

}}
}

#endif
2 changes: 1 addition & 1 deletion src/curl_backend/connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace cpp_restapi::CurlBackend
}


std::pair<std::string, std::string> cpp_restapi::CurlBackend::Connection::fetchPage(const std::string& page)
std::pair<std::string, std::string> Connection::fetchPage(const std::string& page)
{
std::string result;
std::string header_links;
Expand Down

0 comments on commit 15548d3

Please sign in to comment.