Hello community, here is the log from the commit of package ibus-qt for openSUSE:Factory checked in at 2014-07-29 16:47:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-qt (Old) and /work/SRC/openSUSE:Factory/.ibus-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-qt/ibus-qt.changes 2014-02-08 10:34:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibus-qt.new/ibus-qt.changes 2014-07-29 16:47:54.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jul 27 18:15:38 UTC 2014 - [email protected] + +- update version 1.3.3 + * Enable dead_belowdot with de layout. + * Fixed installed but unpackaged files with rpm-build 4.11.1 and %doc. + * Proof of concept implementation for delete-surrounding-text. + * Finish the surrounding text implementation + +------------------------------------------------------------------- Old: ---- ibus-qt-1.3.2-Source.tar.gz New: ---- ibus-qt-1.3.3-Source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-qt.spec ++++++ --- /var/tmp/diff_new_pack.RB6vWb/_old 2014-07-29 16:47:55.000000000 +0200 +++ /var/tmp/diff_new_pack.RB6vWb/_new 2014-07-29 16:47:55.000000000 +0200 @@ -17,16 +17,14 @@ Name: ibus-qt -Version: 1.3.2 +Version: 1.3.3 Release: 0 Summary: Qt IBus library and Qt input method plugin License: GPL-2.0+ -Group: System Environment/Libraries -Url: http://code.google.com/p/ibus/ -Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Group: System/Libraries +Url: https://github.com/ibus/ibus-qt/ +Source: https://github.com/ibus/ibus-qt/releases/download/%{version}/%{name}-%{version}-Source.tar.gz +Source99: baselibs.conf BuildRequires: cmake BuildRequires: dbus-1-devel >= 1.2 BuildRequires: doxygen @@ -34,9 +32,9 @@ BuildRequires: ibus-devel >= 1.2 BuildRequires: libicu-devel >= 4.0 BuildRequires: libqt4-devel -Requires: ibus >= 1.2 -Requires: libqt4 Supplements: packageand(ibus:libqt4) +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%ibus_requires %description Qt IBus library and Qt input method plugin. @@ -54,32 +52,28 @@ %build cmake \ - -DCMAKE_INSTALL_PREFIX=%{_usr} \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIBDIR=%{_libdir} -make +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -%fdupes -s $RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} +%fdupes %{buildroot} # handled by %doc macro -rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} +rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{version} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) +%defattr(-,root,root) %doc COPYING %{_libdir}/libibus-qt.so.* %{_libdir}/qt4/plugins/inputmethods/libqtim-ibus.so %files devel -%defattr(-,root,root,-) +%defattr(-,root,root) %doc AUTHORS README %{_includedir}/* %{_libdir}/libibus-qt.so ++++++ ibus-qt-1.3.2-Source.tar.gz -> ibus-qt-1.3.3-Source.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/CMakeLists.txt new/ibus-qt-1.3.3-Source/CMakeLists.txt --- old/ibus-qt-1.3.2-Source/CMakeLists.txt 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/CMakeLists.txt 2014-04-22 11:11:18.000000000 +0200 @@ -11,7 +11,7 @@ set(MAINTAINER "Peng Huang <shawn.p.huang at gmail dot com>") set(VERSION_MAJOR "1") set(VERSION_MINOR "3") -set(VERSION_PATCH "2") +set(VERSION_PATCH "3") set(VERSION_SNAPDATE "") set(LIB_VERSION "1.3.0") set(LIB_SOVERSION "1") @@ -89,25 +89,10 @@ endif() endif(NOT LIBDIR) -if(NOT DOCDIR) - set(DOCDIR "share/doc/ibus-qt-${CPACK_PACKAGE_VERSION}") -endif(NOT DOCDIR) - if(NOT MANDIR) set(MANDIR "share/man") endif(NOT MANDIR) -# ===== -# install -set(MAIN_DOCS - AUTHORS - README - INSTALL) -install(FILES ${MAIN_DOCS} - DESTINATION ${DOCDIR}) - - - # ====== # sub dirs add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/qtim/ibus-input-context.cpp new/ibus-qt-1.3.3-Source/qtim/ibus-input-context.cpp --- old/ibus-qt-1.3.2-Source/qtim/ibus-input-context.cpp 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/qtim/ibus-input-context.cpp 2014-04-22 11:11:18.000000000 +0200 @@ -2,7 +2,7 @@ /* * ibus - The Input Bus * - * Copyright (c) 2007-2008 Huang Peng <[email protected]> + * Copyright (c) 2007-2014 Huang Peng <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -89,8 +89,9 @@ m_preedit_cursor_pos (0), m_has_focus (false), m_password_mode (false), - m_caps (CapPreeditText | CapFocus), - m_n_compose (0) + m_caps (CapPreeditText | CapFocus | CapSurroundingText), + m_n_compose (0), + m_needs_surrounding_text (false) { Q_ASSERT (!m_bus.isNull ()); @@ -164,7 +165,33 @@ QPoint topleft = widget->mapToGlobal(QPoint(0,0)); rect.translate (topleft); - m_context->setCursorLocation (rect.x (), rect.y (), rect.width (), rect.height ()); + m_context->setCursorLocation (rect.x (), + rect.y (), + rect.width (), + rect.height ()); + + if (m_needs_surrounding_text) { + QString surroundingText = + widget->inputMethodQuery (Qt::ImSurroundingText).toString (); + uint cursor_pos = + widget->inputMethodQuery (Qt::ImCursorPosition).toUInt (); + uint anchor_pos = + widget->inputMethodQuery (Qt::ImAnchorPosition).toUInt (); + + Text *wrappedSurroundingText = new Text (surroundingText); + TextPointer wrappedSurroundingTextPointer (wrappedSurroundingText); + + m_context->setSurroundingText (wrappedSurroundingTextPointer, + cursor_pos, + anchor_pos); + + // We don't destroy wrappedSurroundingText because when + // wrappedSurroundingTextPointer is destroyed when this function + // returns, it calls wrappedSurroundingText->unref() + // which, in turn, destroys wrappedSurroundingText. + // It would actually crash if we did since wrappedSurroundingText + // is already freed. + } #if 0 QVariant value; @@ -248,9 +275,13 @@ *state |= IBus::ReleaseMask; char key_str[64]; - if (XLookupString (&xevent->xkey, key_str, sizeof (key_str), (KeySym *)keyval, 0) <= 0) { - *keyval = (quint32) XLookupKeysym (&xevent->xkey, 0); - } + /* Follow gtkxim module. + * https://git.gnome.org/browse/gtk+/tree/modules/input/gtkimcontextxim.c#n736 + * I think XLookupString can get right keyval even if the return value + * is 0 but key_str might not be a string. + * And XLookupString won't return the negative value in my test. */ + XLookupString (&xevent->xkey, key_str, sizeof (key_str), + (KeySym *)keyval, 0); return true; @@ -552,6 +583,10 @@ this, SLOT (slotShowPreeditText (void))); connect (m_context, SIGNAL (hidePreeditText (void)), this, SLOT (slotHidePreeditText (void))); + connect (m_context, SIGNAL (deleteSurroundingText (int, uint)), + this, SLOT (slotDeleteSurroundingText (int, uint))); + connect (m_context, SIGNAL (requireSurroundingText (void)), + this, SLOT (slotRequireSurroundingText (void))); if (m_has_focus) { m_context->focusIn (); @@ -787,3 +822,32 @@ displayPreeditText (m_preedit, m_preedit_cursor_pos, false); deleteInputContext (); } + +void +IBusInputContext::slotDeleteSurroundingText (int offset, uint nchars) +{ + + QWidget *widget = focusWidget(); + if (widget == NULL) + return; + + int cursor = widget->inputMethodQuery(Qt::ImCursorPosition).toInt(); + + cursor += offset; + if (cursor < 0) { + offset -= cursor; + nchars += cursor; + } + + QInputMethodEvent event; + event.setCommitString ("", offset, nchars); + sendEvent (event); + update (); +} + +void +IBusInputContext::slotRequireSurroundingText (void) +{ + m_needs_surrounding_text = true; + update(); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/qtim/ibus-input-context.h new/ibus-qt-1.3.3-Source/qtim/ibus-input-context.h --- old/ibus-qt-1.3.2-Source/qtim/ibus-input-context.h 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/qtim/ibus-input-context.h 2014-04-22 11:11:18.000000000 +0200 @@ -2,7 +2,7 @@ /* * ibus - The Input Bus * - * Copyright (c) 2007-2008 Huang Peng <[email protected]> + * Copyright (c) 2007-2014 Huang Peng <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,6 +58,8 @@ void slotHidePreeditText (void); void slotConnected (void); void slotDisconnected (void); + void slotDeleteSurroundingText (int offset, uint nchars); + void slotRequireSurroundingText (void); private: void createInputContext (void); @@ -78,6 +80,7 @@ uint m_caps; uint m_compose_buffer[IBUS_MAX_COMPOSE_LEN + 1]; int m_n_compose; + bool m_needs_surrounding_text; }; #endif //__IBUS_INPUT_CONTEXT_H_ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/qtim/moc_ibus-input-context.cxx_parameters new/ibus-qt-1.3.3-Source/qtim/moc_ibus-input-context.cxx_parameters --- old/ibus-qt-1.3.2-Source/qtim/moc_ibus-input-context.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/qtim/moc_ibus-input-context.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,21 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-I/usr/include/ibus-1.0 +-I/usr/include/glib-2.0 +-I/usr/lib64/glib-2.0/include +-I/home/tfujiwar/tmp/a/qtim/../src +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/qtim/moc_ibus-input-context.cxx +/home/tfujiwar/tmp/a/qtim/ibus-input-context.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/interfaces/org.freedesktop.IBus.InputContext.xml new/ibus-qt-1.3.3-Source/src/interfaces/org.freedesktop.IBus.InputContext.xml --- old/ibus-qt-1.3.2-Source/src/interfaces/org.freedesktop.IBus.InputContext.xml 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/interfaces/org.freedesktop.IBus.InputContext.xml 2014-04-22 11:11:18.000000000 +0200 @@ -41,6 +41,11 @@ <arg name="desc" direction="out" type="v"/> </method> <method name="Destroy"/> + <method name="SetSurroundingText"> + <arg name="text" direction="in" type="v"/> + <arg name="cursor_pos" direction="in" type="u"/> + <arg name="anchor_pos" direction="in" type="u"/> + </method> <signal name="CommitText"> <arg name="text" type="v"/> </signal> @@ -51,6 +56,11 @@ <arg name="keycode" type="u"/> <arg name="state" type="u"/> </signal> + <signal name="RequireSurroundingText"/> + <signal name="DeleteSurroundingText"> + <arg name="offset" type="i"/> + <arg name="nchars" type="u"/> + </signal> <signal name="UpdatePreeditText"> <arg name="text" type="v"/> <arg name="cursor_pos" type="u"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusattribute.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusattribute.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusattribute.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusattribute.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusattribute.cxx +/home/tfujiwar/tmp/a/src/qibusattribute.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusattrlist.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusattrlist.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusattrlist.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusattrlist.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusattrlist.cxx +/home/tfujiwar/tmp/a/src/qibusattrlist.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusbus.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusbus.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusbus.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusbus.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusbus.cxx +/home/tfujiwar/tmp/a/src/qibusbus.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibuscomponent.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibuscomponent.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibuscomponent.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibuscomponent.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibuscomponent.cxx +/home/tfujiwar/tmp/a/src/qibuscomponent.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusconfig.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusconfig.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusconfig.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusconfig.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfig.cxx +/home/tfujiwar/tmp/a/src/qibusconfig.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusconfigadaptor.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusconfigadaptor.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusconfigadaptor.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusconfigadaptor.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfigadaptor.cxx +/home/tfujiwar/tmp/a/src/qibusconfigadaptor.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusconfigproxy.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusconfigproxy.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusconfigproxy.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusconfigproxy.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfigproxy.cxx +/home/tfujiwar/tmp/a/src/qibusconfigproxy.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusconfigservice.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusconfigservice.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusconfigservice.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusconfigservice.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusconfigservice.cxx +/home/tfujiwar/tmp/a/src/qibusconfigservice.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusdbusproxy.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusdbusproxy.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusdbusproxy.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusdbusproxy.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusdbusproxy.cxx +/home/tfujiwar/tmp/a/src/qibusdbusproxy.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusengine.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusengine.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusengine.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusengine.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusengine.cxx +/home/tfujiwar/tmp/a/src/qibusengine.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusengineadaptor.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusengineadaptor.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusengineadaptor.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusengineadaptor.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusengineadaptor.cxx +/home/tfujiwar/tmp/a/src/qibusengineadaptor.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusenginedesc.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusenginedesc.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusenginedesc.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusenginedesc.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusenginedesc.cxx +/home/tfujiwar/tmp/a/src/qibusenginedesc.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusenginefactory.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusenginefactory.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusenginefactory.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusenginefactory.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusenginefactory.cxx +/home/tfujiwar/tmp/a/src/qibusenginefactory.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusfactoryadaptor.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusfactoryadaptor.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusfactoryadaptor.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusfactoryadaptor.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusfactoryadaptor.cxx +/home/tfujiwar/tmp/a/src/qibusfactoryadaptor.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusibusproxy.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusibusproxy.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusibusproxy.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusibusproxy.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusibusproxy.cxx +/home/tfujiwar/tmp/a/src/qibusibusproxy.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusinputcontext.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusinputcontext.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusinputcontext.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusinputcontext.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusinputcontext.cxx +/home/tfujiwar/tmp/a/src/qibusinputcontext.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusinputcontextproxy.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusinputcontextproxy.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusinputcontextproxy.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusinputcontextproxy.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusinputcontextproxy.cxx +/home/tfujiwar/tmp/a/src/qibusinputcontextproxy.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibuslookuptable.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibuslookuptable.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibuslookuptable.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibuslookuptable.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibuslookuptable.cxx +/home/tfujiwar/tmp/a/src/qibuslookuptable.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusobject.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusobject.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusobject.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusobject.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusobject.cxx +/home/tfujiwar/tmp/a/src/qibusobject.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusobservedpath.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusobservedpath.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusobservedpath.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusobservedpath.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusobservedpath.cxx +/home/tfujiwar/tmp/a/src/qibusobservedpath.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusproperty.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusproperty.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusproperty.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusproperty.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusproperty.cxx +/home/tfujiwar/tmp/a/src/qibusproperty.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusproplist.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusproplist.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusproplist.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusproplist.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusproplist.cxx +/home/tfujiwar/tmp/a/src/qibusproplist.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibusserializable.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibusserializable.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibusserializable.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibusserializable.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibusserializable.cxx +/home/tfujiwar/tmp/a/src/qibusserializable.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/moc_qibustext.cxx_parameters new/ibus-qt-1.3.3-Source/src/moc_qibustext.cxx_parameters --- old/ibus-qt-1.3.2-Source/src/moc_qibustext.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/moc_qibustext.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,17 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/src/moc_qibustext.cxx +/home/tfujiwar/tmp/a/src/qibustext.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/qibusinputcontext.cpp new/ibus-qt-1.3.3-Source/src/qibusinputcontext.cpp --- old/ibus-qt-1.3.2-Source/src/qibusinputcontext.cpp 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/qibusinputcontext.cpp 2014-04-22 11:11:18.000000000 +0200 @@ -54,6 +54,10 @@ this, SLOT (slotUpdateProperty (const QDBusVariant &))); /* others */ + QObject::connect (m_context, SIGNAL (DeleteSurroundingText (int, uint)), + this, SLOT (slotDeleteSurroundingText (int, uint))); + QObject::connect (m_context, SIGNAL (RequireSurroundingText (void)), + this, SLOT (slotRequireSurroundingText (void))); QObject::connect (m_context, SIGNAL (ForwardKeyEvent (uint, uint, uint)), this, SLOT (slotForwardKeyEvent (uint, uint, uint))); QObject::connect (m_context, SIGNAL (Enabled (void)), @@ -184,6 +188,13 @@ m_context->SetEngine (name); } +void +InputContext::setSurroundingText (const TextPointer &text, uint cursor_pos, uint anchor_pos) +{ + QDBusVariant dbus_text = qDBusVariantFromSerializable (text); + m_context->SetSurroundingText (dbus_text, cursor_pos, anchor_pos); +} + /* slots */ void InputContext::slotCommitText (const QDBusVariant &text) @@ -291,6 +302,18 @@ } void +InputContext::slotDeleteSurroundingText (int offset, uint nchars) +{ + deleteSurroundingText (offset, nchars); +} + +void +InputContext::slotRequireSurroundingText () +{ + requireSurroundingText(); +} + +void InputContext::slotRegisterProperties (const QDBusVariant &props) { registerProperties (qDBusVariantToSerializable<PropList> (props)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/qibusinputcontext.h new/ibus-qt-1.3.3-Source/src/qibusinputcontext.h --- old/ibus-qt-1.3.2-Source/src/qibusinputcontext.h 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/qibusinputcontext.h 2014-04-22 11:11:18.000000000 +0200 @@ -37,6 +37,7 @@ void setCapabilities (uint caps); void setCursorLocation (int x, int y, int w, int h); void setEngine (const QString &name); + void setSurroundingText (const TextPointer &text, uint cursor_pos, uint anchor_pos); public: static InputContextPointer create (const BusPointer &bus, const QString &name); @@ -67,6 +68,8 @@ void disabled (void); void forwardKeyEvent (uint keyval, uint keycode, uint state); + void deleteSurroundingText (int offset, uint nchars); + void requireSurroundingText (void); private Q_SLOTS: void slotCommitText (const QDBusVariant &text); @@ -94,6 +97,8 @@ void slotDisabled(); void slotForwardKeyEvent(uint keyval, uint keycode, uint state); + void slotDeleteSurroundingText(int offset, uint nchars); + void slotRequireSurroundingText(); /* signals: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/qibusinputcontextproxy.cpp new/ibus-qt-1.3.3-Source/src/qibusinputcontextproxy.cpp --- old/ibus-qt-1.3.2-Source/src/qibusinputcontextproxy.cpp 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/qibusinputcontextproxy.cpp 2014-04-22 11:11:18.000000000 +0200 @@ -1,8 +1,8 @@ /* - * This file was generated by qdbusxml2cpp version 0.7 + * This file was generated by qdbusxml2cpp version 0.8 * Command line was: qdbusxml2cpp -p qibusinputcontextproxy -c IBusInputContextProxy -v org.freedesktop.IBus.InputContext.xml org.freedesktop.IBus.InputContext * - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). * * This is an auto-generated file. * This file may have been hand-edited. Look for HAND-EDIT comments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/qibusinputcontextproxy.h new/ibus-qt-1.3.3-Source/src/qibusinputcontextproxy.h --- old/ibus-qt-1.3.2-Source/src/qibusinputcontextproxy.h 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/qibusinputcontextproxy.h 2014-04-22 11:11:18.000000000 +0200 @@ -1,15 +1,15 @@ /* - * This file was generated by qdbusxml2cpp version 0.7 + * This file was generated by qdbusxml2cpp version 0.8 * Command line was: qdbusxml2cpp -p qibusinputcontextproxy -c IBusInputContextProxy -v org.freedesktop.IBus.InputContext.xml org.freedesktop.IBus.InputContext * - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). * * This is an auto-generated file. * Do not edit! All changes made to it will be lost. */ -#ifndef QIBUSINPUTCONTEXTPROXY_H_1268726783 -#define QIBUSINPUTCONTEXTPROXY_H_1268726783 +#ifndef QIBUSINPUTCONTEXTPROXY_H_1395517681 +#define QIBUSINPUTCONTEXTPROXY_H_1395517681 #include <QtCore/QObject> #include <QtCore/QByteArray> @@ -81,14 +81,14 @@ inline QDBusPendingReply<bool> ProcessKeyEvent(uint keyval, uint keycode, uint state) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(keyval) << qVariantFromValue(keycode) << qVariantFromValue(state); + argumentList << QVariant::fromValue(keyval) << QVariant::fromValue(keycode) << QVariant::fromValue(state); return asyncCallWithArgumentList(QLatin1String("ProcessKeyEvent"), argumentList); } inline QDBusPendingReply<> PropertyActivate(const QString &name, int state) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(name) << qVariantFromValue(state); + argumentList << QVariant::fromValue(name) << QVariant::fromValue(state); return asyncCallWithArgumentList(QLatin1String("PropertyActivate"), argumentList); } @@ -101,28 +101,36 @@ inline QDBusPendingReply<> SetCapabilities(uint caps) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(caps); + argumentList << QVariant::fromValue(caps); return asyncCallWithArgumentList(QLatin1String("SetCapabilities"), argumentList); } inline QDBusPendingReply<> SetCursorLocation(int x, int y, int w, int h) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(x) << qVariantFromValue(y) << qVariantFromValue(w) << qVariantFromValue(h); + argumentList << QVariant::fromValue(x) << QVariant::fromValue(y) << QVariant::fromValue(w) << QVariant::fromValue(h); return asyncCallWithArgumentList(QLatin1String("SetCursorLocation"), argumentList); } inline QDBusPendingReply<> SetEngine(const QString &name) { QList<QVariant> argumentList; - argumentList << qVariantFromValue(name); + argumentList << QVariant::fromValue(name); return asyncCallWithArgumentList(QLatin1String("SetEngine"), argumentList); } + inline QDBusPendingReply<> SetSurroundingText(const QDBusVariant &text, uint cursor_pos, uint anchor_pos) + { + QList<QVariant> argumentList; + argumentList << QVariant::fromValue(text) << QVariant::fromValue(cursor_pos) << QVariant::fromValue(anchor_pos); + return asyncCallWithArgumentList(QLatin1String("SetSurroundingText"), argumentList); + } + Q_SIGNALS: // SIGNALS void CommitText(const QDBusVariant &text); void CursorDownLookupTable(); void CursorUpLookupTable(); + void DeleteSurroundingText(int offset, uint nchars); void Disabled(); void Enabled(); void ForwardKeyEvent(uint keyval, uint keycode, uint state); @@ -132,6 +140,7 @@ void PageDownLookupTable(); void PageUpLookupTable(); void RegisterProperties(const QDBusVariant &props); + void RequireSurroundingText(); void ShowAuxiliaryText(); void ShowLookupTable(); void ShowPreeditText(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/src/qibustypes.h new/ibus-qt-1.3.3-Source/src/qibustypes.h --- old/ibus-qt-1.3.2-Source/src/qibustypes.h 2013-03-11 07:54:25.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/src/qibustypes.h 2014-04-22 11:11:18.000000000 +0200 @@ -46,6 +46,7 @@ CapLookupTable = 1 << 2, CapFocus = 1 << 3, CapProperty = 1 << 4, + CapSurroundingText = 1 << 5, } Capabilite; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-qt-1.3.2-Source/test/moc_qibusdemoengine.cxx_parameters new/ibus-qt-1.3.3-Source/test/moc_qibusdemoengine.cxx_parameters --- old/ibus-qt-1.3.2-Source/test/moc_qibusdemoengine.cxx_parameters 1970-01-01 01:00:00.000000000 +0100 +++ new/ibus-qt-1.3.3-Source/test/moc_qibusdemoengine.cxx_parameters 2014-04-22 11:11:58.000000000 +0200 @@ -0,0 +1,21 @@ +-I/usr/include +-I/usr/include/QtGui +-I/usr/include/QtDBus +-I/usr/include/QtXml +-I/usr/include/QtCore +-I/usr/include/QtCore +-I/usr/include/QtDBus +-I/usr/include/dbus-1.0 +-I/usr/lib64/dbus-1.0/include +-I/usr/include/ibus-1.0 +-I/usr/include/glib-2.0 +-I/usr/lib64/glib-2.0/include +-I/home/tfujiwar/tmp/a/test/../src +-D$<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> +-DQT_GUI_LIB +-DQT_DBUS_LIB +-DQT_XML_LIB +-DQT_CORE_LIB +-o +/home/tfujiwar/tmp/a/test/moc_qibusdemoengine.cxx +/home/tfujiwar/tmp/a/test/qibusdemoengine.h -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
