Revision: 6271
Author: nogu.dev
Date: Mon Mar 22 06:53:46 2010
Log: * qt4/immodule/qhelpermanager.cpp
- (QUimHelperManager::checkHelperConnection,
QUimHelperManager::slotStdinActivated):
Remove unused argument from slot.
* qt4/immodule/qhelpermanager.h
- Ditto.
* qt4/switcher/qt4.cpp
- (UimImSwitcher::checkHelperConnection,
UimImSwitcher::slotStdinActivated): Ditto.
* qt4/switcher/qt4.h
- Ditto.
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::checkHelperConnection,
UimStateIndicator::slotStdinActivated): Ditto.
* qt4/toolbar/common-uimstateindicator.h
- Ditto.
http://code.google.com/p/uim/source/detail?r=6271
Modified:
/trunk/qt4/immodule/qhelpermanager.cpp
/trunk/qt4/immodule/qhelpermanager.h
/trunk/qt4/switcher/qt4.cpp
/trunk/qt4/switcher/qt4.h
/trunk/qt4/toolbar/common-uimstateindicator.cpp
/trunk/qt4/toolbar/common-uimstateindicator.h
=======================================
--- /trunk/qt4/immodule/qhelpermanager.cpp Sat Mar 20 16:08:15 2010
+++ /trunk/qt4/immodule/qhelpermanager.cpp Mon Mar 22 06:53:46 2010
@@ -76,14 +76,13 @@
{
notifier = new QSocketNotifier( im_uim_fd,
QSocketNotifier::Read );
connect( notifier, SIGNAL( activated( int ) ),
- this, SLOT( slotStdinActivated( int ) ) );
+ this, SLOT( slotStdinActivated() ) );
}
}
}
-void QUimHelperManager::slotStdinActivated( int socket )
-{
- Q_UNUSED( socket )
+void QUimHelperManager::slotStdinActivated()
+{
QString tmp;
uim_helper_read_proc( im_uim_fd );
=======================================
--- /trunk/qt4/immodule/qhelpermanager.h Sun Feb 28 15:00:48 2010
+++ /trunk/qt4/immodule/qhelpermanager.h Mon Mar 22 06:53:46 2010
@@ -57,7 +57,7 @@
static void send_im_change_whole_desktop( const char *str );
public slots:
- void slotStdinActivated( int );
+ void slotStdinActivated();
};
#endif /* Not def: UIM_QT4_IMMODULE_QHELPERMANAGER_H */
=======================================
--- /trunk/qt4/switcher/qt4.cpp Sat Mar 13 04:38:05 2010
+++ /trunk/qt4/switcher/qt4.cpp Mon Mar 22 06:53:46 2010
@@ -161,7 +161,7 @@
delete notifier;
notifier = new QSocketNotifier( uim_fd, QSocketNotifier::Read
);
connect( notifier, SIGNAL( activated( int ) ),
- this, SLOT( slotStdinActivated( int ) ) );
+ this, SLOT( slotStdinActivated() ) );
}
}
}
@@ -212,9 +212,8 @@
return QString();
}
-void UimImSwitcher::slotStdinActivated( int socket )
-{
- Q_UNUSED( socket )
+void UimImSwitcher::slotStdinActivated()
+{
uim_helper_read_proc( uim_fd );
QString msg;
=======================================
--- /trunk/qt4/switcher/qt4.h Fri Sep 25 08:52:02 2009
+++ /trunk/qt4/switcher/qt4.h Mon Mar 22 06:53:46 2010
@@ -66,7 +66,7 @@
void reloadImList();
protected slots:
- void slotStdinActivated( int socket );
+ void slotStdinActivated();
void slotChangeInputMethod();
protected:
=======================================
--- /trunk/qt4/toolbar/common-uimstateindicator.cpp Tue Mar 2 14:25:16 2010
+++ /trunk/qt4/toolbar/common-uimstateindicator.cpp Mon Mar 22 06:53:46 2010
@@ -109,7 +109,7 @@
delete notifier;
notifier = new QSocketNotifier( uim_fd, QSocketNotifier::Read
);
connect( notifier, SIGNAL( activated( int ) ),
- this, SLOT( slotStdinActivated( int ) ) );
+ this, SLOT( slotStdinActivated() ) );
}
}
}
@@ -220,9 +220,8 @@
disconnect( notifier, SIGNAL( activated( int ) ), 0, 0 );
}
-void UimStateIndicator::slotStdinActivated( int socket )
-{
- Q_UNUSED( socket )
+void UimStateIndicator::slotStdinActivated()
+{
uim_helper_read_proc( uim_fd );
QString tmp;
=======================================
--- /trunk/qt4/toolbar/common-uimstateindicator.h Mon Dec 21 17:42:58 2009
+++ /trunk/qt4/toolbar/common-uimstateindicator.h Mon Mar 22 06:53:46 2010
@@ -73,7 +73,7 @@
void menuRequested( QMenu *menu );
public slots:
- void slotStdinActivated( int socket );
+ void slotStdinActivated();
private slots:
void slotPopupMenuAboutToShow();
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.
