Revision: 6262
Author: nogu.dev
Date: Sun Mar 21 00:08:58 2010
Log: * qt4/immodule/caretstateindicator.cpp
- (CaretStateIndicator::CaretStateIndicator,
CaretStateIndicator::update, CaretStateIndicator::eventFilter):
Rename member variable.
* qt4/immodule/caretstateindicator.h
- (CaretStateIndicator): Ditto.
http://code.google.com/p/uim/source/detail?r=6262
Modified:
/trunk/qt4/immodule/caretstateindicator.cpp
/trunk/qt4/immodule/caretstateindicator.h
=======================================
--- /trunk/qt4/immodule/caretstateindicator.cpp Sat Mar 20 16:08:15 2010
+++ /trunk/qt4/immodule/caretstateindicator.cpp Sun Mar 21 00:08:58 2010
@@ -42,7 +42,7 @@
// caret state indicator is a state indicator nearby the caret.
CaretStateIndicator::CaretStateIndicator(QWidget *parent):
- QWidget(parent, Qt::ToolTip), window(0)
+ QWidget(parent, Qt::ToolTip), m_window(0)
{
QHBoxLayout *layout = new QHBoxLayout;
layout->setMargin(0);
@@ -91,8 +91,8 @@
if (widget) {
QRect rect = widget->inputMethodQuery(Qt::ImMicroFocus).toRect();
move(widget->mapToGlobal(rect.bottomLeft()));
- window = widget->window();
- window->installEventFilter(this);
+ m_window = widget->window();
+ m_window->installEventFilter(this);
}
setVisible(true);
}
@@ -106,7 +106,7 @@
bool CaretStateIndicator::eventFilter(QObject *obj, QEvent *event)
{
- if (obj == window) {
+ if (obj == m_window) {
if (event->type() == QEvent::Move) {
QMoveEvent *moveEvent = static_cast<QMoveEvent *>(event);
move(pos() + moveEvent->pos() - moveEvent->oldPos());
=======================================
--- /trunk/qt4/immodule/caretstateindicator.h Sun Mar 21 00:08:49 2010
+++ /trunk/qt4/immodule/caretstateindicator.h Sun Mar 21 00:08:58 2010
@@ -51,7 +51,7 @@
bool eventFilter(QObject *obj, QEvent *event);
QList<QLabel *> m_labelList;
QTimer *m_timer;
- QWidget *window;
+ QWidget *m_window;
};
#endif
To unsubscribe from this group, send email to uim-commit+unsubscribegooglegroups.com or
reply to this email with the words "REMOVE ME" as the subject.
