SILO-GROUP
/
rex
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Activity

fixed class constructor inheritance

master
Chris Punches 2017-04-18 19:16:10 -04:00
parent 6c95f641ed
commit 41c59ea985
10 changed files with 54 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
.idea/workspace.xml
View File

@ -36,8 +36,7 @@
<state relative-caret-position="162">
<caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
<folding>
<element signature="e#356#477#0" expanded="true" />
<element signature="e#508#683#0" expanded="true" />
<element signature="e#387#562#0" expanded="true" />
</folding>
</state>
</provider>
@ -46,11 +45,10 @@
<file leaf-file-name="loaders.h" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/loaders.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="31" column="52" lean-forward="false" selection-start-line="31" selection-start-column="52" selection-end-line="31" selection-end-column="52" />
<state relative-caret-position="720">
<caret line="40" column="2" lean-forward="true" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="2" />
<folding>
<element signature="e#0#2#0" expanded="true" />
<element signature="e#637#742#0" expanded="true" />
</folding>
</state>
</provider>
@ -90,11 +88,11 @@
</split-first>
<split-second>
<leaf>
<file leaf-file-name="loaders.cpp" pinned="false" current-in-tab="true">
<file leaf-file-name="loaders.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="954">
<caret line="53" column="1" lean-forward="false" selection-start-line="53" selection-start-column="1" selection-end-line="53" selection-end-column="1" />
<state relative-caret-position="1026">
<caret line="57" column="10" lean-forward="false" selection-start-line="57" selection-start-column="10" selection-end-line="57" selection-end-column="10" />
<folding>
<element signature="e#0#2#0" expanded="true" />
</folding>
@ -102,14 +100,13 @@
</provider>
</entry>
</file>
<file leaf-file-name="main.cpp" pinned="false" current-in-tab="false">
<file leaf-file-name="main.cpp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="10" column="26" lean-forward="false" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
<folding>
<element signature="e#356#477#0" expanded="true" />
<element signature="e#508#683#0" expanded="true" />
<element signature="e#387#562#0" expanded="true" />
</folding>
</state>
</provider>
@ -269,9 +266,9 @@
<option value="$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units" />
<option value="$PROJECT_DIR$/CMakeLists.txt" />
<option value="$PROJECT_DIR$/cmake-build-debug/config.json" />
<option value="$PROJECT_DIR$/main.cpp" />
<option value="$PROJECT_DIR$/src/loaders.cpp" />
<option value="$PROJECT_DIR$/src/loaders.h" />
<option value="$PROJECT_DIR$/src/loaders.cpp" />
<option value="$PROJECT_DIR$/main.cpp" />
</list>
</option>
</component>
@ -592,12 +589,12 @@
<updated>1491540343823</updated>
<workItem from="1491540345736" duration="17928000" />
<workItem from="1491759279673" duration="614000" />
<workItem from="1492298506932" duration="25549000" />
<workItem from="1492298506932" duration="26349000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44091000" />
<option name="totallyTimeSpent" value="44891000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -614,14 +611,14 @@
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1103081" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3295342" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295342" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="LuaJ" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1407334" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1407334" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2499049" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32942432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32903865" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@ -830,34 +827,32 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.cpp">
<entry file="file://$PROJECT_DIR$/src/loaders.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
<state relative-caret-position="720">
<caret line="40" column="2" lean-forward="true" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="2" />
<folding>
<element signature="e#356#477#0" expanded="true" />
<element signature="e#508#683#0" expanded="true" />
<element signature="e#0#2#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="954">
<caret line="53" column="1" lean-forward="false" selection-start-line="53" selection-start-column="1" selection-end-line="53" selection-end-column="1" />
<state relative-caret-position="1026">
<caret line="57" column="10" lean-forward="false" selection-start-line="57" selection-start-column="10" selection-end-line="57" selection-end-column="10" />
<folding>
<element signature="e#0#2#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders.h">
<entry file="file://$PROJECT_DIR$/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="31" column="52" lean-forward="false" selection-start-line="31" selection-start-column="52" selection-end-line="31" selection-end-column="52" />
<state relative-caret-position="180">
<caret line="10" column="26" lean-forward="false" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
<folding>
<element signature="e#0#2#0" expanded="true" />
<element signature="e#637#742#0" expanded="true" />
<element signature="e#387#562#0" expanded="true" />
</folding>
</state>
</provider>

1
cmake-build-debug/CMakeFiles/Progress/1
View File

@ -1 +0,0 @@
empty

1
cmake-build-debug/CMakeFiles/Progress/2
View File

@ -1 +0,0 @@
empty

1
cmake-build-debug/CMakeFiles/Progress/count.txt
View File

@ -1 +0,0 @@
4

BIN
cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o Normal file
View File

Binary file not shown.

BIN
cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o Normal file
View File

Binary file not shown.

BIN
cmake-build-debug/ftests
View File

Binary file not shown.

9
main.cpp
View File

@ -8,16 +8,11 @@
void json_file_to_json_obj(std::string filename)
{
Unit jsonLoader = Unit(filename);
Conf jsonLoader = Conf(filename);
Json::Value root = jsonLoader.get_root();
const std::string planpath = root.get("plan_path", NULL).asString();
/*
for ( int index = 0; index < arrtest.size(); index++ )
{
std::cout << arrtest[index] << "\n";
}
*/
std::cout << planpath;
}

15
src/loaders.cpp
View File

@ -39,18 +39,23 @@ JLoader::JLoader( std::string filename )
}
}
Json::Value JLoader::get_root()
{
return this->json_root;
}
Unit::Unit( std::string filename ): JLoader( filename )
{
};
Plan::Plan( std::string filename ): JLoader( filename )
{
};
Conf::Conf( std::string filename ): JLoader( filename )
{
};

33
src/loaders.h
View File

@ -22,32 +22,33 @@ class JLoader
Json::Value get_root();
};
class Unit: public Jloader
class Unit: public JLoader
{
private:
Json::Value json_root;
public:
using JLoader::JLoader;
Unit( std::string filename ): JLoader( filename );
Json::Value get_root(): JLoader::get_root();
Unit( std::string filename );
};
class Plan: public JLoader
{
private:
Json::Value json_root;
public:
using JLoader::JLoader;
Plan( std::string filename );
};
/*class Plan: Jloader
class Conf: public JLoader
{
Plan()
{
};
private:
Json::Value json_root;
public:
using JLoader::JLoader;
Conf( std::string filename );
};
class Conf: Jloader
{
Conf()
{
};
};*/
#endif //FTESTS_LOADERS_H