diff options
Diffstat (limited to 'kview/kviewcanvas')
-rw-r--r-- | kview/kviewcanvas/config/confmodules.cpp | 6 | ||||
-rw-r--r-- | kview/kviewcanvas/config/generalconfigwidget.ui | 12 | ||||
-rw-r--r-- | kview/kviewcanvas/kimagecanvas.cpp | 4 | ||||
-rw-r--r-- | kview/kviewcanvas/kimageholder.cpp | 4 | ||||
-rw-r--r-- | kview/kviewcanvas/kimageholder.h | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index f9cf90cc..0aeb3b1b 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -20,7 +20,7 @@ #include "generalconfigwidget.h" #include "defaults.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqframe.h> @@ -38,8 +38,8 @@ KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQS : KCModule( KViewCanvasConfigFactory::instance(), parent, args ) , m_config( new KConfig( "kviewcanvasrc" ) ) { - TQBoxLayout * tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); + TQBoxLayout * layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); m_pWidget = new GeneralConfigWidget( this ); m_pWidget->m_pMinWidth ->setRange( 1, 200 ); diff --git a/kview/kviewcanvas/config/generalconfigwidget.ui b/kview/kviewcanvas/config/generalconfigwidget.ui index 746fa02c..108ed82e 100644 --- a/kview/kviewcanvas/config/generalconfigwidget.ui +++ b/kview/kviewcanvas/config/generalconfigwidget.ui @@ -110,7 +110,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -127,7 +127,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -138,7 +138,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -181,7 +181,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -239,7 +239,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> @@ -259,7 +259,7 @@ A value of 100 would cause a 1000x1000 image to be compressed horizontally by a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index a2e6c5b7..3efd8228 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -543,7 +543,7 @@ void KImageCanvas::slotUpdateImage() if( m_bSizeChanged || m_bNewImage ) { - TQSize sh = m_client->tqsizeHint(); + TQSize sh = m_client->sizeHint(); if( ! sh.isValid() ) sh = TQSize( 0, 0 ); m_client->resize( sh ); @@ -587,7 +587,7 @@ void KImageCanvas::slotUpdateImage() void KImageCanvas::mouseMoveEvent( TQMouseEvent * ) { - if( m_cursor.tqshape() == TQt::BlankCursor ) + if( m_cursor.shape() == TQt::BlankCursor ) { m_cursor.setShape( Qt::CrossCursor ); viewport()->setCursor( m_cursor ); diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index f2e54462..b34cfab2 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -207,7 +207,7 @@ void KImageHolder::eraseSelect() inner.rBottom() -= 1; r -= inner; - TQMemArray<TQRect> rects = r.tqrects(); + TQMemArray<TQRect> rects = r.rects(); if( m_pDoubleBuffer ) for( unsigned int i = 0; i < rects.size(); ++i ) @@ -269,7 +269,7 @@ TQRect KImageHolder::selection() const return TQRect(); } -TQSize KImageHolder::tqsizeHint() const +TQSize KImageHolder::sizeHint() const { if( m_pPixmap ) return m_pPixmap->size(); diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index 165ec0bc..a5555e2b 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -57,7 +57,7 @@ class KImageHolder : public TQWidget */ TQRect selection() const; - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setDrawRect( const TQRect & rect ) { m_drawRect = rect; } const TQRect & drawRect() const { return m_drawRect; } |