diff options
Diffstat (limited to 'kjsembed')
| -rw-r--r-- | kjsembed/builtins/resources.cpp | 2 | ||||
| -rw-r--r-- | kjsembed/ksimpleprocess.cpp | 4 | ||||
| -rw-r--r-- | kjsembed/plugins/imagefx_plugin.cpp | 28 | ||||
| -rw-r--r-- | kjsembed/slotutils.cpp | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/kjsembed/builtins/resources.cpp b/kjsembed/builtins/resources.cpp index 192b17fa..b7244d84 100644 --- a/kjsembed/builtins/resources.cpp +++ b/kjsembed/builtins/resources.cpp @@ -140,7 +140,7 @@ KJS::Value StdDirsImp::call( KJS::ExecState *exec, KJS::Object &/*self*/, const case StdDirsImp::homeDirPath: return KJS::String(TQDir::homeDirPath()); case StdDirsImp::applicationDirPath: - return KJS::String(qApp->applicationDirPath()); + return KJS::String(tqApp->applicationDirPath()); default: kdWarning() << "StdDirsImp has no method " << id << endl; } diff --git a/kjsembed/ksimpleprocess.cpp b/kjsembed/ksimpleprocess.cpp index 212566ec..a1adf3ac 100644 --- a/kjsembed/ksimpleprocess.cpp +++ b/kjsembed/ksimpleprocess.cpp @@ -69,7 +69,7 @@ void KSimpleProcess::enter_loop() TQWidget dummy(0,0,WType_Dialog | WShowModal); dummy.setFocusPolicy( TQWidget::NoFocus ); qt_enter_modal(&dummy); - qApp->enter_loop(); + tqApp->enter_loop(); qt_leave_modal(&dummy); } @@ -77,7 +77,7 @@ void KSimpleProcess::slotProcessExited() { while( m_proc->canReadLineStdout() ) m_currBuffer += m_proc->readLineStdout() + '\n'; - qApp->exit_loop(); + tqApp->exit_loop(); } void KSimpleProcess::slotReceivedStdout() diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp index ef3d0ed0..b7da9e91 100644 --- a/kjsembed/plugins/imagefx_plugin.cpp +++ b/kjsembed/plugins/imagefx_plugin.cpp @@ -560,9 +560,9 @@ inline const T& kClamp( const T& x, const T& low, const T& high ) } static inline unsigned int intensityValue( unsigned int color ) { - return (unsigned int)( (0.299*qRed( color ) + - 0.587*qGreen( color ) + - 0.1140000000000001*qBlue( color ) ) ); + return (unsigned int)( (0.299*tqRed( color ) + + 0.587*tqGreen( color ) + + 0.1140000000000001*tqBlue( color ) ) ); } struct BumpmapParams { @@ -643,7 +643,7 @@ static void bumpmap_convert_row( uint *row, unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5); *p++ = lut[(unsigned int) ( waterlevel + ( ( idx - - waterlevel) * qBlue( *row )) / 255.0 )]; + waterlevel) * tqBlue( *row )) / 255.0 )]; } else { unsigned int idx = (unsigned int)(intensityValue( *row ) + 0.5); *p++ = lut[idx]; @@ -730,19 +730,19 @@ static void bumpmap_row( uint *src, * also change */ if (compensate) { - int red = (int)((qRed( *src ) * shade) / (params->compensation * 255)); - int green = (int)((qGreen( *src ) * shade) / (params->compensation * 255)); - int blue = (int)((qBlue( *src ) * shade) / (params->compensation * 255)); - int alpha = (int)((qAlpha( *src ) * shade) / (params->compensation * 255)); + int red = (int)((tqRed( *src ) * shade) / (params->compensation * 255)); + int green = (int)((tqGreen( *src ) * shade) / (params->compensation * 255)); + int blue = (int)((tqBlue( *src ) * shade) / (params->compensation * 255)); + int alpha = (int)((tqAlpha( *src ) * shade) / (params->compensation * 255)); ++src; - *dest++ = qRgba( red, green, blue, alpha ); + *dest++ = tqRgba( red, green, blue, alpha ); } else { - int red = qRed( *src ) * shade / 255; - int green = qGreen( *src ) * shade / 255; - int blue = qBlue( *src ) * shade / 255; - int alpha = qAlpha( *src ) * shade / 255; + int red = tqRed( *src ) * shade / 255; + int green = tqGreen( *src ) * shade / 255; + int blue = tqBlue( *src ) * shade / 255; + int alpha = tqAlpha( *src ) * shade / 255; ++src; - *dest++ = qRgba( red, green, blue, alpha ); + *dest++ = tqRgba( red, green, blue, alpha ); } /* Next pixel */ diff --git a/kjsembed/slotutils.cpp b/kjsembed/slotutils.cpp index 5d929fd2..1ba13188 100644 --- a/kjsembed/slotutils.cpp +++ b/kjsembed/slotutils.cpp @@ -244,7 +244,7 @@ void JSSlotUtils::implantColor( KJS::ExecState *exec, TQUObject *uo, const KJS:: pix = pix << 8; pix = pix | a; - *color = TQColor( qRgba(r,g,b,a), pix ); + *color = TQColor( tqRgba(r,g,b,a), pix ); } } |