Commits

Anonymous committed eb4c0b5

Define API typedefs in function.h

- Since we had to create some typedefs for API types in a previous
commit I added all the missing ones, this in turn led to renaming
the deserialisation methods in NeoVimConnector

Comments (0)

Files changed (6)

scripts/code-gen.lua

 
 -- neovim.h --
 
-local typedefs = {}
-typedefs['Integer'] = 'int64_t'
-typedefs['Position'] = 'QPoint'
-typedefs['Boolean'] = 'bool'
-typedefs['String'] = 'QString'
-typedefs['Object'] = 'QVariant'
-typedefs['Buffer'] = 'int64_t'
-typedefs['Window'] = 'int64_t'
-typedefs['Tabpage'] = 'int64_t'
-typedefs['StringArray'] = 'QStringList'
-
 local neovim_h = io.open(path.join(outputfolder, 'neovim.h'), 'wb')
 neovim_h:write([[
 // Autogenerated NeoVim-Qt signal/slot declarations
     if j ~= 1 then
       neovim_h:write(', ')
     end
-    neovim_h:write(typedefs[param[1]] or param[1])
+    neovim_h:write(param[1])
     neovim_h:write(' '..param[2])
   end
   neovim_h:write(');\n')
   
   neovim_h:write('\tvoid ');
   neovim_h:write('on_'..fn.name..'(')
-  neovim_h:write(typedefs[fn.return_type] or fn.return_type)
+  neovim_h:write(fn.return_type)
   neovim_h:write(');\n')
 
 -- FIXME generate error handlers
     if j ~= 1 then
       neovim_cpp:write(', ')
     end
-    neovim_cpp:write(typedefs[param[1]] or param[1])
+    neovim_cpp:write(param[1])
     neovim_cpp:write(' '..param[2])
   end
   neovim_cpp:write(')\n{\n')
 neovim_cpp:write('\tbool convfail=true;\n')
 
 neovim_cpp:write('\tif ( failed ) {\n')
-neovim_cpp:write('\t\temit error(m_c->to_QString(res));\n')
+neovim_cpp:write('\t\temit error(m_c->to_String(res));\n')
 neovim_cpp:write('\t\treturn;\n')
 neovim_cpp:write('\t}\n\n')
 
 neovim_cpp:write('\tswitch(fun) {\n')
 for i = 1, #api.functions do
   local fn = api.functions[i]
-  local return_type = (typedefs[fn.return_type] or fn.return_type)
+  local return_type = (fn.return_type)
   neovim_cpp:write('\tcase Function::'..fname_to_enum(fn.name)..':\n')
   neovim_cpp:write('\t\t{\n') -- context
   if fn.return_type ~= 'void' then

src/auto/neovim.cpp

 {
 }
 
-void NeoVim::buffer_get_length(int64_t buffer)
+void NeoVim::buffer_get_length(Buffer buffer)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_LENGTH, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_get_line(int64_t buffer, int64_t index)
+void NeoVim::buffer_get_line(Buffer buffer, Integer index)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_LINE, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_set_line(int64_t buffer, int64_t index, QString line)
+void NeoVim::buffer_set_line(Buffer buffer, Integer index, String line)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_SET_LINE, 3);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_del_line(int64_t buffer, int64_t index)
+void NeoVim::buffer_del_line(Buffer buffer, Integer index)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_DEL_LINE, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_get_slice(int64_t buffer, int64_t start, int64_t end, bool include_start, bool include_end)
+void NeoVim::buffer_get_slice(Buffer buffer, Integer start, Integer end, Boolean include_start, Boolean include_end)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_SLICE, 5);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_set_slice(int64_t buffer, int64_t start, int64_t end, bool include_start, bool include_end, QStringList replacement)
+void NeoVim::buffer_set_slice(Buffer buffer, Integer start, Integer end, Boolean include_start, Boolean include_end, StringArray replacement)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_SET_SLICE, 6);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_get_var(int64_t buffer, QString name)
+void NeoVim::buffer_get_var(Buffer buffer, String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_VAR, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_set_var(int64_t buffer, QString name, QVariant value)
+void NeoVim::buffer_set_var(Buffer buffer, String name, Object value)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_SET_VAR, 3);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_get_option(int64_t buffer, QString name)
+void NeoVim::buffer_get_option(Buffer buffer, String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_OPTION, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_set_option(int64_t buffer, QString name, QVariant value)
+void NeoVim::buffer_set_option(Buffer buffer, String name, Object value)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_SET_OPTION, 3);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_get_number(int64_t buffer)
+void NeoVim::buffer_get_number(Buffer buffer)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_NUMBER, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_get_name(int64_t buffer)
+void NeoVim::buffer_get_name(Buffer buffer)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_NAME, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_set_name(int64_t buffer, QString name)
+void NeoVim::buffer_set_name(Buffer buffer, String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_SET_NAME, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_is_valid(int64_t buffer)
+void NeoVim::buffer_is_valid(Buffer buffer)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_IS_VALID, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_insert(int64_t buffer, int64_t lnum, QStringList lines)
+void NeoVim::buffer_insert(Buffer buffer, Integer lnum, StringArray lines)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_INSERT, 3);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::buffer_get_mark(int64_t buffer, QString name)
+void NeoVim::buffer_get_mark(Buffer buffer, String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_BUFFER_GET_MARK, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::tabpage_get_windows(int64_t tabpage)
+void NeoVim::tabpage_get_windows(Tabpage tabpage)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_TABPAGE_GET_WINDOWS, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::tabpage_get_var(int64_t tabpage, QString name)
+void NeoVim::tabpage_get_var(Tabpage tabpage, String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_TABPAGE_GET_VAR, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::tabpage_set_var(int64_t tabpage, QString name, QVariant value)
+void NeoVim::tabpage_set_var(Tabpage tabpage, String name, Object value)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_TABPAGE_SET_VAR, 3);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::tabpage_get_window(int64_t tabpage)
+void NeoVim::tabpage_get_window(Tabpage tabpage)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_TABPAGE_GET_WINDOW, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::tabpage_is_valid(int64_t tabpage)
+void NeoVim::tabpage_is_valid(Tabpage tabpage)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_TABPAGE_IS_VALID, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_push_keys(QString str)
+void NeoVim::vim_push_keys(String str)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_PUSH_KEYS, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_command(QString str)
+void NeoVim::vim_command(String str)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_COMMAND, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_eval(QString str)
+void NeoVim::vim_eval(String str)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_EVAL, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_strwidth(QString str)
+void NeoVim::vim_strwidth(String str)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_STRWIDTH, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_change_directory(QString dir)
+void NeoVim::vim_change_directory(String dir)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_CHANGE_DIRECTORY, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_set_current_line(QString line)
+void NeoVim::vim_set_current_line(String line)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_LINE, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_get_var(QString name)
+void NeoVim::vim_get_var(String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_VAR, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_set_var(QString name, QVariant value)
+void NeoVim::vim_set_var(String name, Object value)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_VAR, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_get_vvar(QString name)
+void NeoVim::vim_get_vvar(String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_VVAR, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_get_option(QString name)
+void NeoVim::vim_get_option(String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_GET_OPTION, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_set_option(QString name, QVariant value)
+void NeoVim::vim_set_option(String name, Object value)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_OPTION, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_out_write(QString str)
+void NeoVim::vim_out_write(String str)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_OUT_WRITE, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_err_write(QString str)
+void NeoVim::vim_err_write(String str)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_ERR_WRITE, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_set_current_buffer(int64_t buffer)
+void NeoVim::vim_set_current_buffer(Buffer buffer)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_BUFFER, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_set_current_window(int64_t window)
+void NeoVim::vim_set_current_window(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_WINDOW, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::vim_set_current_tabpage(int64_t tabpage)
+void NeoVim::vim_set_current_tabpage(Tabpage tabpage)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_VIM_SET_CURRENT_TABPAGE, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_buffer(int64_t window)
+void NeoVim::window_get_buffer(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_BUFFER, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_cursor(int64_t window)
+void NeoVim::window_get_cursor(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_CURSOR, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_set_cursor(int64_t window, QPoint pos)
+void NeoVim::window_set_cursor(Window window, Position pos)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_SET_CURSOR, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_height(int64_t window)
+void NeoVim::window_get_height(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_HEIGHT, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_set_height(int64_t window, int64_t height)
+void NeoVim::window_set_height(Window window, Integer height)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_SET_HEIGHT, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_width(int64_t window)
+void NeoVim::window_get_width(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_WIDTH, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_set_width(int64_t window, int64_t width)
+void NeoVim::window_set_width(Window window, Integer width)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_SET_WIDTH, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_var(int64_t window, QString name)
+void NeoVim::window_get_var(Window window, String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_VAR, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_set_var(int64_t window, QString name, QVariant value)
+void NeoVim::window_set_var(Window window, String name, Object value)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_SET_VAR, 3);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_option(int64_t window, QString name)
+void NeoVim::window_get_option(Window window, String name)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_OPTION, 2);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_set_option(int64_t window, QString name, QVariant value)
+void NeoVim::window_set_option(Window window, String name, Object value)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_SET_OPTION, 3);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_position(int64_t window)
+void NeoVim::window_get_position(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_POSITION, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_get_tabpage(int64_t window)
+void NeoVim::window_get_tabpage(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_GET_TABPAGE, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 
 }
 
-void NeoVim::window_is_valid(int64_t window)
+void NeoVim::window_is_valid(Window window)
 {
 	NeoVimRequest *r = m_c->startRequest(Function::NEOVIM_FN_WINDOW_IS_VALID, 1);
 	connect(r, &NeoVimRequest::finished, this, &NeoVim::handleResponse);
 {
 	bool convfail=true;
 	if ( failed ) {
-		emit error(m_c->to_QString(res));
+		emit error(m_c->to_String(res));
 		return;
 	}
 
 	switch(fun) {
 	case Function::NEOVIM_FN_BUFFER_GET_LENGTH:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Integer data = m_c->to_Integer(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_length";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_LINE:
 		{
-			QString data = m_c->to_QString(res, &convfail);
+			String data = m_c->to_String(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_line";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_SLICE:
 		{
-			QStringList data = m_c->to_QStringList(res, &convfail);
+			StringArray data = m_c->to_StringArray(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_slice";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_SET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_set_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_OPTION:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_option";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_NUMBER:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Integer data = m_c->to_Integer(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_number";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_NAME:
 		{
-			QString data = m_c->to_QString(res, &convfail);
+			String data = m_c->to_String(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_name";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_IS_VALID:
 		{
-			bool data = m_c->to_bool(res, &convfail);
+			Boolean data = m_c->to_Boolean(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_is_valid";
 			} else {
 		break;
 	case Function::NEOVIM_FN_BUFFER_GET_MARK:
 		{
-			QPoint data = m_c->to_QPoint(res, &convfail);
+			Position data = m_c->to_Position(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal buffer_get_mark";
 			} else {
 		break;
 	case Function::NEOVIM_FN_TABPAGE_GET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal tabpage_get_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_TABPAGE_SET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal tabpage_set_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_TABPAGE_GET_WINDOW:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Window data = m_c->to_Window(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal tabpage_get_window";
 			} else {
 		break;
 	case Function::NEOVIM_FN_TABPAGE_IS_VALID:
 		{
-			bool data = m_c->to_bool(res, &convfail);
+			Boolean data = m_c->to_Boolean(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal tabpage_is_valid";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_EVAL:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_eval";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_STRWIDTH:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Integer data = m_c->to_Integer(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_strwidth";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_LIST_RUNTIME_PATHS:
 		{
-			QStringList data = m_c->to_QStringList(res, &convfail);
+			StringArray data = m_c->to_StringArray(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_list_runtime_paths";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_GET_CURRENT_LINE:
 		{
-			QString data = m_c->to_QString(res, &convfail);
+			String data = m_c->to_String(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_get_current_line";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_GET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_get_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_SET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_set_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_GET_VVAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_get_vvar";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_GET_OPTION:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_get_option";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_GET_CURRENT_BUFFER:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Buffer data = m_c->to_Buffer(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_get_current_buffer";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_GET_CURRENT_WINDOW:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Window data = m_c->to_Window(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_get_current_window";
 			} else {
 		break;
 	case Function::NEOVIM_FN_VIM_GET_CURRENT_TABPAGE:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Tabpage data = m_c->to_Tabpage(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal vim_get_current_tabpage";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_BUFFER:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Buffer data = m_c->to_Buffer(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_buffer";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_CURSOR:
 		{
-			QPoint data = m_c->to_QPoint(res, &convfail);
+			Position data = m_c->to_Position(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_cursor";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_HEIGHT:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Integer data = m_c->to_Integer(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_height";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_WIDTH:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Integer data = m_c->to_Integer(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_width";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_SET_VAR:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_set_var";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_OPTION:
 		{
-			QVariant data = m_c->to_QVariant(res, &convfail);
+			Object data = m_c->to_Object(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_option";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_POSITION:
 		{
-			QPoint data = m_c->to_QPoint(res, &convfail);
+			Position data = m_c->to_Position(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_position";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_GET_TABPAGE:
 		{
-			int64_t data = m_c->to_int64_t(res, &convfail);
+			Tabpage data = m_c->to_Tabpage(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_get_tabpage";
 			} else {
 		break;
 	case Function::NEOVIM_FN_WINDOW_IS_VALID:
 		{
-			bool data = m_c->to_bool(res, &convfail);
+			Boolean data = m_c->to_Boolean(res, &convfail);
 			if (convfail) {
 				qWarning() << "Error unpacking data for signal window_is_valid";
 			} else {

src/auto/neovim.h

 private:
 	NeoVimConnector *m_c;
 public slots:
-	void buffer_get_length(int64_t buffer);
-	void buffer_get_line(int64_t buffer, int64_t index);
-	void buffer_set_line(int64_t buffer, int64_t index, QString line);
-	void buffer_del_line(int64_t buffer, int64_t index);
-	void buffer_get_slice(int64_t buffer, int64_t start, int64_t end, bool include_start, bool include_end);
-	void buffer_set_slice(int64_t buffer, int64_t start, int64_t end, bool include_start, bool include_end, QStringList replacement);
-	void buffer_get_var(int64_t buffer, QString name);
-	void buffer_set_var(int64_t buffer, QString name, QVariant value);
-	void buffer_get_option(int64_t buffer, QString name);
-	void buffer_set_option(int64_t buffer, QString name, QVariant value);
-	void buffer_get_number(int64_t buffer);
-	void buffer_get_name(int64_t buffer);
-	void buffer_set_name(int64_t buffer, QString name);
-	void buffer_is_valid(int64_t buffer);
-	void buffer_insert(int64_t buffer, int64_t lnum, QStringList lines);
-	void buffer_get_mark(int64_t buffer, QString name);
-	void tabpage_get_windows(int64_t tabpage);
-	void tabpage_get_var(int64_t tabpage, QString name);
-	void tabpage_set_var(int64_t tabpage, QString name, QVariant value);
-	void tabpage_get_window(int64_t tabpage);
-	void tabpage_is_valid(int64_t tabpage);
-	void vim_push_keys(QString str);
-	void vim_command(QString str);
-	void vim_eval(QString str);
-	void vim_strwidth(QString str);
+	void buffer_get_length(Buffer buffer);
+	void buffer_get_line(Buffer buffer, Integer index);
+	void buffer_set_line(Buffer buffer, Integer index, String line);
+	void buffer_del_line(Buffer buffer, Integer index);
+	void buffer_get_slice(Buffer buffer, Integer start, Integer end, Boolean include_start, Boolean include_end);
+	void buffer_set_slice(Buffer buffer, Integer start, Integer end, Boolean include_start, Boolean include_end, StringArray replacement);
+	void buffer_get_var(Buffer buffer, String name);
+	void buffer_set_var(Buffer buffer, String name, Object value);
+	void buffer_get_option(Buffer buffer, String name);
+	void buffer_set_option(Buffer buffer, String name, Object value);
+	void buffer_get_number(Buffer buffer);
+	void buffer_get_name(Buffer buffer);
+	void buffer_set_name(Buffer buffer, String name);
+	void buffer_is_valid(Buffer buffer);
+	void buffer_insert(Buffer buffer, Integer lnum, StringArray lines);
+	void buffer_get_mark(Buffer buffer, String name);
+	void tabpage_get_windows(Tabpage tabpage);
+	void tabpage_get_var(Tabpage tabpage, String name);
+	void tabpage_set_var(Tabpage tabpage, String name, Object value);
+	void tabpage_get_window(Tabpage tabpage);
+	void tabpage_is_valid(Tabpage tabpage);
+	void vim_push_keys(String str);
+	void vim_command(String str);
+	void vim_eval(String str);
+	void vim_strwidth(String str);
 	void vim_list_runtime_paths();
-	void vim_change_directory(QString dir);
+	void vim_change_directory(String dir);
 	void vim_get_current_line();
 	void vim_del_current_line();
-	void vim_set_current_line(QString line);
-	void vim_get_var(QString name);
-	void vim_set_var(QString name, QVariant value);
-	void vim_get_vvar(QString name);
-	void vim_get_option(QString name);
-	void vim_set_option(QString name, QVariant value);
-	void vim_out_write(QString str);
-	void vim_err_write(QString str);
+	void vim_set_current_line(String line);
+	void vim_get_var(String name);
+	void vim_set_var(String name, Object value);
+	void vim_get_vvar(String name);
+	void vim_get_option(String name);
+	void vim_set_option(String name, Object value);
+	void vim_out_write(String str);
+	void vim_err_write(String str);
 	void vim_get_buffers();
 	void vim_get_current_buffer();
-	void vim_set_current_buffer(int64_t buffer);
+	void vim_set_current_buffer(Buffer buffer);
 	void vim_get_windows();
 	void vim_get_current_window();
-	void vim_set_current_window(int64_t window);
+	void vim_set_current_window(Window window);
 	void vim_get_tabpages();
 	void vim_get_current_tabpage();
-	void vim_set_current_tabpage(int64_t tabpage);
-	void window_get_buffer(int64_t window);
-	void window_get_cursor(int64_t window);
-	void window_set_cursor(int64_t window, QPoint pos);
-	void window_get_height(int64_t window);
-	void window_set_height(int64_t window, int64_t height);
-	void window_get_width(int64_t window);
-	void window_set_width(int64_t window, int64_t width);
-	void window_get_var(int64_t window, QString name);
-	void window_set_var(int64_t window, QString name, QVariant value);
-	void window_get_option(int64_t window, QString name);
-	void window_set_option(int64_t window, QString name, QVariant value);
-	void window_get_position(int64_t window);
-	void window_get_tabpage(int64_t window);
-	void window_is_valid(int64_t window);
+	void vim_set_current_tabpage(Tabpage tabpage);
+	void window_get_buffer(Window window);
+	void window_get_cursor(Window window);
+	void window_set_cursor(Window window, Position pos);
+	void window_get_height(Window window);
+	void window_set_height(Window window, Integer height);
+	void window_get_width(Window window);
+	void window_set_width(Window window, Integer width);
+	void window_get_var(Window window, String name);
+	void window_set_var(Window window, String name, Object value);
+	void window_get_option(Window window, String name);
+	void window_set_option(Window window, String name, Object value);
+	void window_get_position(Window window);
+	void window_get_tabpage(Window window);
+	void window_is_valid(Window window);
 signals:
-	void on_buffer_get_length(int64_t);
-	void on_buffer_get_line(QString);
+	void on_buffer_get_length(Integer);
+	void on_buffer_get_line(String);
 	void on_buffer_set_line(void);
 	void on_buffer_del_line(void);
-	void on_buffer_get_slice(QStringList);
+	void on_buffer_get_slice(StringArray);
 	void on_buffer_set_slice(void);
-	void on_buffer_get_var(QVariant);
-	void on_buffer_set_var(QVariant);
-	void on_buffer_get_option(QVariant);
+	void on_buffer_get_var(Object);
+	void on_buffer_set_var(Object);
+	void on_buffer_get_option(Object);
 	void on_buffer_set_option(void);
-	void on_buffer_get_number(int64_t);
-	void on_buffer_get_name(QString);
+	void on_buffer_get_number(Integer);
+	void on_buffer_get_name(String);
 	void on_buffer_set_name(void);
-	void on_buffer_is_valid(bool);
+	void on_buffer_is_valid(Boolean);
 	void on_buffer_insert(void);
-	void on_buffer_get_mark(QPoint);
+	void on_buffer_get_mark(Position);
 	void on_tabpage_get_windows(WindowArray);
-	void on_tabpage_get_var(QVariant);
-	void on_tabpage_set_var(QVariant);
-	void on_tabpage_get_window(int64_t);
-	void on_tabpage_is_valid(bool);
+	void on_tabpage_get_var(Object);
+	void on_tabpage_set_var(Object);
+	void on_tabpage_get_window(Window);
+	void on_tabpage_is_valid(Boolean);
 	void on_vim_push_keys(void);
 	void on_vim_command(void);
-	void on_vim_eval(QVariant);
-	void on_vim_strwidth(int64_t);
-	void on_vim_list_runtime_paths(QStringList);
+	void on_vim_eval(Object);
+	void on_vim_strwidth(Integer);
+	void on_vim_list_runtime_paths(StringArray);
 	void on_vim_change_directory(void);
-	void on_vim_get_current_line(QString);
+	void on_vim_get_current_line(String);
 	void on_vim_del_current_line(void);
 	void on_vim_set_current_line(void);
-	void on_vim_get_var(QVariant);
-	void on_vim_set_var(QVariant);
-	void on_vim_get_vvar(QVariant);
-	void on_vim_get_option(QVariant);
+	void on_vim_get_var(Object);
+	void on_vim_set_var(Object);
+	void on_vim_get_vvar(Object);
+	void on_vim_get_option(Object);
 	void on_vim_set_option(void);
 	void on_vim_out_write(void);
 	void on_vim_err_write(void);
 	void on_vim_get_buffers(BufferArray);
-	void on_vim_get_current_buffer(int64_t);
+	void on_vim_get_current_buffer(Buffer);
 	void on_vim_set_current_buffer(void);
 	void on_vim_get_windows(WindowArray);
-	void on_vim_get_current_window(int64_t);
+	void on_vim_get_current_window(Window);
 	void on_vim_set_current_window(void);
 	void on_vim_get_tabpages(TabpageArray);
-	void on_vim_get_current_tabpage(int64_t);
+	void on_vim_get_current_tabpage(Tabpage);
 	void on_vim_set_current_tabpage(void);
-	void on_window_get_buffer(int64_t);
-	void on_window_get_cursor(QPoint);
+	void on_window_get_buffer(Buffer);
+	void on_window_get_cursor(Position);
 	void on_window_set_cursor(void);
-	void on_window_get_height(int64_t);
+	void on_window_get_height(Integer);
 	void on_window_set_height(void);
-	void on_window_get_width(int64_t);
+	void on_window_get_width(Integer);
 	void on_window_set_width(void);
-	void on_window_get_var(QVariant);
-	void on_window_set_var(QVariant);
-	void on_window_get_option(QVariant);
+	void on_window_get_var(Object);
+	void on_window_set_var(Object);
+	void on_window_get_option(Object);
 	void on_window_set_option(void);
-	void on_window_get_position(QPoint);
-	void on_window_get_tabpage(int64_t);
-	void on_window_is_valid(bool);
+	void on_window_get_position(Position);
+	void on_window_get_tabpage(Tabpage);
+	void on_window_is_valid(Boolean);
 
 };
 }; // Namespace
 
 namespace NeoVimQt {
 
+typedef int64_t Integer;
+typedef QPoint Position;
+typedef bool Boolean;
+typedef QString String;
+typedef QVariant Object;
+typedef int64_t Buffer;
+typedef int64_t Window;
+typedef int64_t Tabpage;
 typedef QList<int64_t> BufferArray;
 typedef QList<int64_t> WindowArray;
 typedef QList<int64_t> TabpageArray;
+typedef QStringList StringArray;
 
 /**
  * A function signature used to identify NeoVim RPC functions 

src/neovimconnector.cpp

  * We use QVariants for RPC functions use the *Object* type do not use this in any other conditions
  *
  */
-QVariant NeoVimConnector::to_QVariant(const msgpack_object& obj, bool *failed)
+Object NeoVimConnector::to_Object(const msgpack_object& obj, bool *failed)
 {
 	if ( failed ) {
 		*failed = false;
 		res = obj.via.dec;
 		break;
 	case MSGPACK_OBJECT_RAW:
-		res = to_QString(obj, failed);
+		res = to_String(obj, failed);
 		break;
 	case MSGPACK_OBJECT_ARRAY:
 		// Either a QVariantList or a QStringList
 		{
 		QVariantList ls;
 		for (uint64_t i=0; i<obj.via.array.size; i++) {
-			QVariant v = to_QVariant(obj.via.array.ptr[i], failed);
+			QVariant v = to_Object(obj.via.array.ptr[i], failed);
 			if ( v.isNull() ) {
 				setError(UnexpectedMsg,
 					tr("Found unexpected data type when unpacking Map as QVariantList"));
 				return QVariant();
 			}
 			m.insert(
-				to_QString(obj.via.map.ptr[i].key), 
-				to_QVariant(obj.via.map.ptr[i].val, failed));
+				to_String(obj.via.map.ptr[i].key), 
+				to_Object(obj.via.map.ptr[i].val, failed));
 		}
 		res = m;
 		}
 			this, &NeoVimConnector::handleMetadata);
 }
 
-QString NeoVimConnector::to_QString(const msgpack_object& obj, bool *failed)
+QString NeoVimConnector::to_String(const msgpack_object& obj, bool *failed)
 {
 	if ( failed ) {
 		*failed = true;
 	return QByteArray(obj.via.raw.ptr, obj.via.raw.size);
 }
 
-QPoint NeoVimConnector::to_QPoint(const msgpack_object& obj, bool *failed)
+Position NeoVimConnector::to_Position(const msgpack_object& obj, bool *failed)
 {
 	if ( failed ) {
 		*failed = true;
 		*failed = false;
 	}
 	// QPoint is (x,y)  neovim Position is (row, col)
-	return QPoint(to_int64_t(obj.via.array.ptr[1]), to_int64_t(obj.via.array.ptr[0]));
+	return QPoint(to_Integer(obj.via.array.ptr[1]), to_Integer(obj.via.array.ptr[0]));
 }
 
-bool NeoVimConnector::to_bool(const msgpack_object& obj, bool *failed)
+Boolean NeoVimConnector::to_Boolean(const msgpack_object& obj, bool *failed)
 {
 	if ( failed ) {
 		*failed = true;
 	return obj.via.boolean;
 }
 
-QStringList NeoVimConnector::to_QStringList(const msgpack_object& obj, bool *failed)
+StringArray NeoVimConnector::to_StringArray(const msgpack_object& obj, bool *failed)
 {
 	if ( failed ) {
 		*failed = true;
 				tr("Found non-raw element type when unpacking a QStringList"));
 			return QStringList();
 		}
-		ret.append(to_QString(obj));
+		ret.append(to_String(obj));
 	}
 
 	if ( failed ) {
 	return ret;
 }
 
-int64_t NeoVimConnector::to_int64_t(const msgpack_object& obj, bool *failed)
+Integer NeoVimConnector::to_Integer(const msgpack_object& obj, bool *failed)
 {
 	if ( failed ) {
 		*failed = true;
 	return obj.via.i64;
 }
 
+Buffer NeoVimConnector::to_Buffer(const msgpack_object& obj, bool *failed)
+{
+	return to_Integer(obj, failed);
+}
+Window NeoVimConnector::to_Window(const msgpack_object& obj, bool *failed)
+{
+	return to_Integer(obj, failed);
+}
+Tabpage NeoVimConnector::to_Tabpage(const msgpack_object& obj, bool *failed)
+{
+	return to_Integer(obj, failed);
+}
+
 QList<int64_t> NeoVimConnector::to_IntegerArray(const msgpack_object& obj, bool *failed)
 {
 	if ( failed ) {
 				tr("Found non-raw element type when unpacking a QStringList"));
 			return QList<int64_t>();
 		}
-		ret.append(to_int64_t(obj));
+		ret.append(to_Integer(obj));
 	}
 
 	if ( failed ) {
 		return;
 	}
 
-	qDebug() << req;
 	switch(req.via.array.ptr[0].via.u64) {
 	case 0:
 		dispatchRequest(req);

src/neovimconnector.h

 
 	// Methods to pack datatypes as message pack
 	// This is what you can use for arguments after startRequest
-	void send(int64_t);
+	void send(Integer);
 	void send(const QString&);
 	void send(const QLatin1String& s) { send(QString(s));}
 	void send(const QStringList&);
 	void send(const QByteArray&);
 	void send(bool);
 
+	// 
 	// Methods to unpack msgpack responses
+	//
 	QByteArray to_QByteArray(const msgpack_object&, bool *failed=NULL);
-	QString to_QString(const msgpack_object&, bool *failed=NULL);
-	bool to_bool(const msgpack_object&, bool *failed=NULL);
-	int64_t to_int64_t(const msgpack_object&, bool *failed=NULL);
-	QStringList to_QStringList(const msgpack_object&, bool *failed=NULL);
-	QPoint to_QPoint(const msgpack_object&, bool *failed=NULL);
-	QVariant to_QVariant(const msgpack_object& msg, bool *failed=NULL);
+	String to_String(const msgpack_object&, bool *failed=NULL);
+	Boolean to_Boolean(const msgpack_object&, bool *failed=NULL);
+	StringArray to_StringArray(const msgpack_object&, bool *failed=NULL);
+	Position to_Position(const msgpack_object&, bool *failed=NULL);
+	Object to_Object(const msgpack_object& msg, bool *failed=NULL);
+
+	// These are all to_Integer
+	Integer to_Integer(const msgpack_object&, bool *failed=NULL);
+	Buffer to_Buffer(const msgpack_object&, bool *failed=NULL);
+	Window to_Window(const msgpack_object&, bool *failed=NULL);
+	Tabpage to_Tabpage(const msgpack_object&, bool *failed=NULL);
+
+	// These are all basically the same as to_IntegerArray
 	QList<int64_t> to_IntegerArray(const msgpack_object& msg, bool *failed=NULL);
-	QList<int64_t> to_WindowArray(const msgpack_object& msg, bool *failed=NULL);
-	QList<int64_t> to_BufferArray(const msgpack_object& msg, bool *failed=NULL);
-	QList<int64_t> to_TabpageArray(const msgpack_object& msg, bool *failed=NULL);
+	WindowArray to_WindowArray(const msgpack_object& msg, bool *failed=NULL);
+	BufferArray to_BufferArray(const msgpack_object& msg, bool *failed=NULL);
+	TabpageArray to_TabpageArray(const msgpack_object& msg, bool *failed=NULL);
 
 	//static QVariant toVariant(const msgpack_object&);