Skip to content

Commit df714a5

Browse files
committed
replace RimeApi::get_*_dir with Deployer's getters
1 parent f21369c commit df714a5

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

src/types.cc

+10-17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include <rime_api.h>
12
#include <rime/candidate.h>
23
#include <rime/translation.h>
34
#include <rime/segmentation.h>
@@ -15,9 +16,9 @@
1516
#include <rime/gear/memory.h>
1617
#include <rime/dict/dictionary.h>
1718
#include <rime/dict/user_dictionary.h>
19+
#include <rime/service.h>
1820
#include <rime/switcher.h>
1921
#include "lua_gears.h"
20-
#include <rime/service.h>
2122
#include <boost/regex.hpp>
2223

2324
#include "lib/lua_export_type.h"
@@ -1845,43 +1846,35 @@ namespace KeySequenceReg {
18451846

18461847
namespace RimeApiReg {
18471848
string get_rime_version() {
1848-
RimeApi* rime = rime_get_api();
1849-
return string(rime->get_version());
1849+
return string(rime_get_api()->get_version());
18501850
}
18511851

18521852
string get_shared_data_dir() {
1853-
RimeApi* rime = rime_get_api();
1854-
return string(rime->get_shared_data_dir());
1853+
return Service::instance().deployer().shared_data_dir.string();
18551854
}
18561855

18571856
string get_user_data_dir() {
1858-
RimeApi* rime = rime_get_api();
1859-
return string(rime->get_user_data_dir());
1857+
return Service::instance().deployer().user_data_dir.string();
18601858
}
18611859

18621860
string get_sync_dir() {
1863-
RimeApi* rime = rime_get_api();
1864-
return string(rime->get_sync_dir());
1861+
return Service::instance().deployer().sync_dir.string();
18651862
}
18661863

18671864
string get_distribution_name(){
1868-
Deployer &deployer(Service::instance().deployer());
1869-
return deployer.distribution_name;
1865+
return Service::instance().deployer().distribution_name;
18701866
}
18711867

18721868
string get_distribution_code_name(){
1873-
Deployer &deployer(Service::instance().deployer());
1874-
return deployer.distribution_code_name;
1869+
return Service::instance().deployer().distribution_code_name;
18751870
}
18761871

18771872
string get_distribution_version(){
1878-
Deployer &deployer(Service::instance().deployer());
1879-
return deployer.distribution_version;
1873+
return Service::instance().deployer().distribution_version;
18801874
}
18811875

18821876
string get_user_id(){
1883-
Deployer &deployer(Service::instance().deployer());
1884-
return deployer.user_id;
1877+
return Service::instance().deployer().user_id;
18851878
}
18861879

18871880
// boost::regex api

0 commit comments

Comments
 (0)