summaryrefslogtreecommitdiffstats
path: root/kview/kviewcanvas
diff options
context:
space:
mode:
Diffstat (limited to 'kview/kviewcanvas')
-rw-r--r--kview/kviewcanvas/config/generalconfigwidget.ui4
-rw-r--r--kview/kviewcanvas/kimageholder.cpp10
2 files changed, 7 insertions, 7 deletions
diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui
index da279892..746fa02c 100644
--- a/kview/kviewcanvas/config/generalconfigwidget.ui
+++ b/kview/kviewcanvas/config/generalconfigwidget.ui
@@ -283,8 +283,8 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index 13ee9e43..a26a061f 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -96,7 +96,7 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
}
else // create a selection
{
- TQWidget * tqparentwidget = ( TQWidget* )tqparent();
+ TQWidget * parentwidget = ( TQWidget* )tqparent();
if( ! m_bSelecting )
{
m_bSelecting = true;
@@ -127,17 +127,17 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
// -2 => scroll to the left 2 px per 50ms
// 2 => scroll to the right 2 px per 50ms
// ...
- m_xOffset = mapTo( tqparentwidget, ev->pos() ).x();
- m_yOffset = mapTo( tqparentwidget, ev->pos() ).y();
+ m_xOffset = mapTo( parentwidget, ev->pos() ).x();
+ m_yOffset = mapTo( parentwidget, ev->pos() ).y();
if( m_xOffset > 0 )
{
- m_xOffset -= tqparentwidget->width();
+ m_xOffset -= parentwidget->width();
if( m_xOffset < 0 )
m_xOffset = 0;
}
if( m_yOffset > 0 )
{
- m_yOffset -= tqparentwidget->height();
+ m_yOffset -= parentwidget->height();
if( m_yOffset < 0 )
m_yOffset = 0;
}