summaryrefslogtreecommitdiffstats
path: root/plugins/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/src')
-rw-r--r--plugins/src/accessible/widgets/qaccessiblewidget.cpp14
-rw-r--r--plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp2
-rw-r--r--plugins/src/inputmethods/simple/qsimpleinputcontext.cpp16
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontext_x11.cpp38
4 files changed, 35 insertions, 35 deletions
diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/plugins/src/accessible/widgets/qaccessiblewidget.cpp
index 1bcc05a..baa4503 100644
--- a/plugins/src/accessible/widgets/qaccessiblewidget.cpp
+++ b/plugins/src/accessible/widgets/qaccessiblewidget.cpp
@@ -164,7 +164,7 @@ QRect QAccessibleWidget::rect( int control ) const
{
#if defined(QT_DEBUG)
if ( control )
- tqWarning( "QAccessibleWidget::rect: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
+ qWarning( "QAccessibleWidget::rect: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
#else
Q_UNUSED(control)
#endif
@@ -179,7 +179,7 @@ int QAccessibleWidget::navigate( NavDirection dir, int startControl ) const
{
#if defined(QT_DEBUG)
if ( startControl )
- tqWarning( "QAccessibleWidget::navigate: This implementation does not support subelements! (ID %d unknown for %s)", startControl, widget()->className() );
+ qWarning( "QAccessibleWidget::navigate: This implementation does not support subelements! (ID %d unknown for %s)", startControl, widget()->className() );
#else
Q_UNUSED(startControl);
#endif
@@ -249,7 +249,7 @@ int QAccessibleWidget::navigate( NavDirection dir, int startControl ) const
return ( index != -1 ) ? index+1 : -1;
}
default:
- tqWarning( "QAccessibleWidget::navigate: unhandled request" );
+ qWarning( "QAccessibleWidget::navigate: unhandled request" );
break;
};
return -1;
@@ -297,7 +297,7 @@ bool QAccessibleWidget::doDefaultAction( int control )
{
#if defined(QT_DEBUG)
if ( control )
- tqWarning( "QAccessibleWidget::doDefaultAction: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
+ qWarning( "QAccessibleWidget::doDefaultAction: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
#else
Q_UNUSED(control)
#endif
@@ -407,7 +407,7 @@ bool QAccessibleWidget::setFocus( int control )
{
#if defined(QT_DEBUG)
if ( control )
- tqWarning( "QAccessibleWidget::setFocus: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
+ qWarning( "QAccessibleWidget::setFocus: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() );
#else
Q_UNUSED(control)
#endif
@@ -422,7 +422,7 @@ bool QAccessibleWidget::setFocus( int control )
bool QAccessibleWidget::setSelected( int, bool, bool )
{
#if defined(QT_DEBUG)
- tqWarning( "QAccessibleWidget::setSelected: This function not supported for simple widgets." );
+ qWarning( "QAccessibleWidget::setSelected: This function not supported for simple widgets." );
#endif
return FALSE;
}
@@ -431,7 +431,7 @@ bool QAccessibleWidget::setSelected( int, bool, bool )
void QAccessibleWidget::clearSelection()
{
#if defined(QT_DEBUG)
- tqWarning( "QAccessibleWidget::clearSelection: This function not supported for simple widgets." );
+ qWarning( "QAccessibleWidget::clearSelection: This function not supported for simple widgets." );
#endif
}
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
index b1b294a..42791a4 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -306,7 +306,7 @@ void QMultiInputContext::changeInputMethod( QString key )
currentIMKey = key;
- //tqDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
+ //qDebug( "QMultiInputContext::changeInputMethod(): index=%d, slave=%s",
// imIndex, (const char *)_slave->identifierName() );
}
}
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
index 0e1146d..07d6928 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
@@ -141,7 +141,7 @@ bool QSimpleInputContext::filterEvent( const QEvent *event )
// only one character. See description of
// QInputContext::filterEvent() about key compression.
val = text[0].unicode();
- // tqDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
+ // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() );
}
// Store value
@@ -165,13 +165,13 @@ bool QSimpleInputContext::filterEvent( const QEvent *event )
void QSimpleInputContext::setFocus()
{
- //tqDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
+ //qDebug( "QSimpleInputContext: %p->setFocus(), focusWidget()=%p",
//this, focusWidget() );
}
void QSimpleInputContext::unsetFocus()
{
- //tqDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
+ //qDebug( "QSimpleInputContext: %p->unsetFocus(), focusWidget()=%p",
//this, focusWidget() );
reset();
}
@@ -189,7 +189,7 @@ void QSimpleInputContext::mouseHandler( int x, QEvent::Type type,
case QEvent::MouseButtonRelease:
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
- // tqDebug( "QSimpleInputContext::mouseHandler: "
+ // qDebug( "QSimpleInputContext::mouseHandler: "
// "x=%d, type=%d, button=%d, state=%d", x, type, button, state );
break;
default:
@@ -241,7 +241,7 @@ bool QSimpleInputContext::checkComposeTable( uint* composeBuffer, const QCompose
// no entries were found
if ( p == composeTable->data + composeTable->size ) {
- // tqDebug( "no match" );
+ // qDebug( "no match" );
clearComposeBuffer();
return FALSE;
}
@@ -251,18 +251,18 @@ bool QSimpleInputContext::checkComposeTable( uint* composeBuffer, const QCompose
// check if partial match
if ( composeBuffer[i] == 0 && p->keys[i] ) {
- // tqDebug("partial match");
+ // qDebug("partial match");
return TRUE;
}
if ( composeBuffer[i] != p->keys[i] ) {
- // tqDebug("different entry");
+ // qDebug("different entry");
clearComposeBuffer();
return i!=0;
}
}
- // tqDebug("match exactly");
+ // qDebug("match exactly");
// match exactly
commitChar( p->value );
diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
index a778d5f..a0438bc 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
+++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
@@ -86,7 +86,7 @@ extern "C" {
XPointer /*client_data*/,
XPointer /*call_data*/)
{
- // tqDebug("xim_create_callback");
+ // qDebug("xim_create_callback");
QXIMInputContext::create_xim();
}
@@ -94,7 +94,7 @@ extern "C" {
XPointer /*client_data*/,
XPointer /*call_data*/)
{
- // tqDebug("xim_destroy_callback");
+ // qDebug("xim_destroy_callback");
QXIMInputContext::close_xim();
Display *dpy = QPaintDevice::x11AppDisplay();
XRegisterIMInstantiateCallback(dpy, 0, 0, 0,
@@ -170,7 +170,7 @@ extern "C" {
QXIMInputContext *qic = (QXIMInputContext *) client_data;
if (! qic) {
#ifdef QT_XIM_DEBUG
- tqDebug("compose start: no qic");
+ qDebug("compose start: no qic");
#endif // QT_XIM_DEBUG
return 0;
@@ -180,7 +180,7 @@ extern "C" {
qic->sendIMEvent( QEvent::IMStart );
#ifdef QT_XIM_DEBUG
- tqDebug("compose start");
+ qDebug("compose start");
#endif // QT_XIM_DEBUG
return 0;
@@ -190,7 +190,7 @@ extern "C" {
QXIMInputContext *qic = (QXIMInputContext *) client_data;
if (! qic) {
#ifdef QT_XIM_DEBUG
- tqDebug("compose event: invalid compose event %p", qic);
+ qDebug("compose event: invalid compose event %p", qic);
#endif // QT_XIM_DEBUG
return 0;
@@ -202,7 +202,7 @@ extern "C" {
send_imstart = TRUE;
} else if ( ! qic->isComposing() || ! qic->hasFocus() ) {
#ifdef QT_XIM_DEBUG
- tqDebug( "compose event: invalid compose event composing=%d hasFocus=%d",
+ qDebug( "compose event: invalid compose event composing=%d hasFocus=%d",
qic->isComposing(), qic->hasFocus() );
#endif // QT_XIM_DEBUG
@@ -221,7 +221,7 @@ extern "C" {
! drawstruct->chg_length && ! text ) {
if( qic->composingText.isEmpty() ) {
#ifdef QT_XIM_DEBUG
- tqDebug( "compose emptied" );
+ qDebug( "compose emptied" );
#endif // QT_XIM_DEBUG
// if the composition string has been emptied, we need
// to send an IMEnd event
@@ -296,7 +296,7 @@ extern "C" {
bool qt_compose_emptied = qic->composingText.isEmpty();
if ( qt_compose_emptied ) {
#ifdef QT_XIM_DEBUG
- tqDebug( "compose emptied" );
+ qDebug( "compose emptied" );
#endif // QT_XIM_DEBUG
// if the composition string has been emptied, we need
// to send an IMEnd event
@@ -356,12 +356,12 @@ void QXIMInputContext::setHolderWidget( QWidget *widget )
#if !defined(QT_NO_XIM)
fontsetRefCount++;
if (! qt_xim) {
- tqWarning("QInputContext: no input method context available");
+ qWarning("QInputContext: no input method context available");
return;
}
if (! widget->isTopLevel()) {
- // tqWarning("QInputContext: cannot create input context for non-toplevel widgets");
+ // qWarning("QInputContext: cannot create input context for non-toplevel widgets");
return;
}
@@ -420,7 +420,7 @@ void QXIMInputContext::setHolderWidget( QWidget *widget )
(char *) 0);
if (! ic)
- tqFatal("Failed to create XIM input context!");
+ qFatal("Failed to create XIM input context!");
// when resetting the input context, preserve the input state
(void) XSetICValues((XIC) ic, XNResetState, XIMPreserveState, (char *) 0);
@@ -483,11 +483,11 @@ void QXIMInputContext::init_xim()
ximServerName = "";
if ( !XSupportsLocale() )
- tqWarning("Qt: Locales not supported on X server");
+ qWarning("Qt: Locales not supported on X server");
#ifdef USE_X11R6_XIM
else if ( XSetLocaleModifiers (ximServerName.ascii()) == 0 )
- tqWarning( "Qt: Cannot set locale modifiers: %s",
+ qWarning( "Qt: Cannot set locale modifiers: %s",
ximServerName.ascii());
else {
Display *dpy = QPaintDevice::x11AppDisplay();
@@ -499,7 +499,7 @@ void QXIMInputContext::init_xim()
}
#else // !USE_X11R6_XIM
else if ( XSetLocaleModifiers ("") == 0 )
- tqWarning("Qt: Cannot set locale modifiers");
+ qWarning("Qt: Cannot set locale modifiers");
else
QXIMInputContext::create_xim();
#endif // USE_X11R6_XIM
@@ -522,7 +522,7 @@ void QXIMInputContext::create_xim()
destroy.callback = (XIMProc) xim_destroy_callback;
destroy.client_data = 0;
if ( XSetIMValues( qt_xim, XNDestroyCallback, &destroy, (char *) 0 ) != 0 )
- tqWarning( "Xlib doesn't support destroy callback");
+ qWarning( "Xlib doesn't support destroy callback");
#endif // USE_X11R6_XIM
XIMStyles *styles = 0;
@@ -553,7 +553,7 @@ void QXIMInputContext::create_xim()
}
}
- // tqDebug("QApplication: using im style %lx", qt_xim_style);
+ // qDebug("QApplication: using im style %lx", qt_xim_style);
XFree( (char *)styles );
}
@@ -566,7 +566,7 @@ void QXIMInputContext::create_xim()
} else {
// Give up
- tqWarning( "No supported input style found."
+ qWarning( "No supported input style found."
" See InputMethod documentation.");
QXIMInputContext::close_xim();
}
@@ -714,7 +714,7 @@ void QXIMInputContext::reset()
#if !defined(QT_NO_XIM)
if ( focusWidget() && isComposing() && ! composingText.isNull() ) {
#ifdef QT_XIM_DEBUG
- tqDebug("QXIMInputContext::reset: composing - sending IMEnd (empty) to %p",
+ qDebug("QXIMInputContext::reset: composing - sending IMEnd (empty) to %p",
focusWidget() );
#endif // QT_XIM_DEBUG
@@ -742,7 +742,7 @@ void QXIMInputContext::resetClientState()
void QXIMInputContext::close( const QString &errMsg )
{
- tqDebug( errMsg );
+ qDebug( errMsg );
emit deletionRequested();
}