Revision: 6212
Author: nogu.dev
Date: Tue Mar 2 14:25:16 2010
Log: * qt4/chardict/chargridview.cpp
- (CharGridView::resizeEvent): Use Q_UNUSED macro to suppress warning.
* qt4/immodule/candidatewindow.cpp
- (CandidateWindow::layoutWindow): Ditto.
* qt4/immodule/qhelpermanager.cpp
- (QUimHelperManager::slotStdinActivated): Ditto.
* qt4/immodule/quiminputcontext.cpp
- (QUimInputContext::x11FilterEvent, QUimInputContext::reloadUim): Ditto.
* qt4/pref/customwidgets.cpp
- (KeyGrabDialog::keyReleaseEvent): Ditto.
* qt4/switcher/qt4.cpp
- (UimImSwitcher::selectedImName): Ditto.
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::slotStdinActivated): Ditto.
* qt4/toolbar/standalone-qt4.cpp
- (UimToolbarDraggingHandler::mousePressEvent,
UimToolbarDraggingHandler::mouseReleaseEvent,
UimToolbarDraggingHandler::mouseMoveEvent,
UimToolbarDraggingHandler::mouseDoubleClickEvent): Ditto.
http://code.google.com/p/uim/source/detail?r=6212
Modified:
/trunk/qt4/chardict/chargridview.cpp
/trunk/qt4/immodule/candidatewindow.cpp
/trunk/qt4/immodule/qhelpermanager.cpp
/trunk/qt4/immodule/quiminputcontext.cpp
/trunk/qt4/pref/customwidgets.cpp
/trunk/qt4/switcher/qt4.cpp
/trunk/qt4/toolbar/common-uimstateindicator.cpp
/trunk/qt4/toolbar/standalone-qt4.cpp
=======================================
--- /trunk/qt4/chardict/chargridview.cpp Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/chardict/chargridview.cpp Tue Mar 2 14:25:16 2010
@@ -107,8 +107,9 @@
}
}
-void CharGridView::resizeEvent( QResizeEvent * /* e */ )
-{
+void CharGridView::resizeEvent( QResizeEvent *e )
+{
+ Q_UNUSED( e )
updateCharGridView();
}
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp Tue Mar 2 14:24:49 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp Tue Mar 2 14:25:16 2010
@@ -426,8 +426,9 @@
uim_set_candidate_index( ic->uimContext(), candidateIndex );
}
-void CandidateWindow::layoutWindow( int x, int y, int /* w */, int h )
-{
+void CandidateWindow::layoutWindow( int x, int y, int w, int h )
+{
+ Q_UNUSED( w )
int destX = x;
int destY = y + h;
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp Sun Feb 28 15:01:04 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp Tue Mar 2 14:25:16 2010
@@ -81,8 +81,9 @@
}
}
-void QUimHelperManager::slotStdinActivated( int /*socket*/ )
-{
+void QUimHelperManager::slotStdinActivated( int socket )
+{
+ Q_UNUSED( socket )
QString tmp;
uim_helper_read_proc( im_uim_fd );
=======================================
--- /trunk/qt4/immodule/quiminputcontext.cpp Sun Feb 28 15:01:04 2010
+++ /trunk/qt4/immodule/quiminputcontext.cpp Tue Mar 2 14:25:16 2010
@@ -175,9 +175,8 @@
#ifdef Q_WS_X11
bool QUimInputContext::x11FilterEvent( QWidget *keywidget, XEvent *event )
{
- // to suppress warning
- keywidget = keywidget;
- event = event;
+ Q_UNUSED( keywidget )
+ Q_UNUSED( event )
#if UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK
return uim_x_kana_input_hack_filter_event( m_uc, event );
@@ -425,10 +424,9 @@
void QUimInputContext::setMicroFocus( int x, int y, int w, int h, QFont *f
)
{
+ Q_UNUSED( f )
qDebug("IC setMicroFocus (%d, %d), (%d, %d)", x, y, w, h);
- f = f; // to suppress warning
-
cwin->layoutWindow( x, y, w, h );
}
=======================================
--- /trunk/qt4/pref/customwidgets.cpp Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/pref/customwidgets.cpp Tue Mar 2 14:25:16 2010
@@ -901,8 +901,9 @@
pressed_unichar = e->text().at(0);
}
-void KeyGrabDialog::keyReleaseEvent( QKeyEvent * /* e */ )
-{
+void KeyGrabDialog::keyReleaseEvent( QKeyEvent *e )
+{
+ Q_UNUSED( e )
// create keystr
setKeyStr();
=======================================
--- /trunk/qt4/switcher/qt4.cpp Fri Sep 25 09:11:50 2009
+++ /trunk/qt4/switcher/qt4.cpp Tue Mar 2 14:25:16 2010
@@ -212,8 +212,9 @@
return QString();
}
-void UimImSwitcher::slotStdinActivated( int /*socket*/ )
-{
+void UimImSwitcher::slotStdinActivated( int socket )
+{
+ Q_UNUSED( socket )
uim_helper_read_proc( uim_fd );
QString msg;
=======================================
--- /trunk/qt4/toolbar/common-uimstateindicator.cpp Thu Feb 25 14:55:18 2010
+++ /trunk/qt4/toolbar/common-uimstateindicator.cpp Tue Mar 2 14:25:16 2010
@@ -220,8 +220,9 @@
disconnect( notifier, SIGNAL( activated( int ) ), 0, 0 );
}
-void UimStateIndicator::slotStdinActivated( int /*socket*/ )
-{
+void UimStateIndicator::slotStdinActivated( int socket )
+{
+ Q_UNUSED( socket )
uim_helper_read_proc( uim_fd );
QString tmp;
=======================================
--- /trunk/qt4/toolbar/standalone-qt4.cpp Thu Feb 25 14:55:18 2010
+++ /trunk/qt4/toolbar/standalone-qt4.cpp Tue Mar 2 14:25:16 2010
@@ -163,8 +163,9 @@
return QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
}
-void UimToolbarDraggingHandler::mousePressEvent( QMouseEvent * /* e */ )
-{
+void UimToolbarDraggingHandler::mousePressEvent( QMouseEvent *e )
+{
+ Q_UNUSED( e )
isDragging = true;
grabMouse( QCursor( Qt::SizeAllCursor) );
@@ -172,14 +173,16 @@
offsetY = QCursor::pos().y() - this->parentWidget()->y();
}
-void UimToolbarDraggingHandler::mouseReleaseEvent( QMouseEvent * /* e */ )
-{
+void UimToolbarDraggingHandler::mouseReleaseEvent( QMouseEvent *e )
+{
+ Q_UNUSED( e )
isDragging = false;
releaseMouse();
}
-void UimToolbarDraggingHandler::mouseMoveEvent( QMouseEvent * /* e */ )
-{
+void UimToolbarDraggingHandler::mouseMoveEvent( QMouseEvent *e )
+{
+ Q_UNUSED( e )
if ( isDragging ) {
QPoint pos = QCursor::pos();
pos -= QPoint(offsetX, offsetY);
@@ -187,8 +190,9 @@
}
}
-void UimToolbarDraggingHandler::mouseDoubleClickEvent( QMouseEvent * /* e
*/ )
-{
+void UimToolbarDraggingHandler::mouseDoubleClickEvent( QMouseEvent *e )
+{
+ Q_UNUSED( e )
isDragging = false;
emit handleDoubleClicked();
}
