summaryrefslogtreecommitdiffstats
path: root/kview/kviewcanvas
diff options
context:
space:
mode:
Diffstat (limited to 'kview/kviewcanvas')
-rw-r--r--kview/kviewcanvas/ChangeLog2
-rw-r--r--kview/kviewcanvas/config/confmodules.cpp25
-rw-r--r--kview/kviewcanvas/config/confmodules.h5
-rw-r--r--kview/kviewcanvas/config/defaults.h2
-rw-r--r--kview/kviewcanvas/kimagecanvas.cpp34
-rw-r--r--kview/kviewcanvas/kimagecanvas.h11
-rw-r--r--kview/kviewcanvas/kimageholder.cpp14
-rw-r--r--kview/kviewcanvas/kimageholder.h5
-rw-r--r--kview/kviewcanvas/test/test.cpp2
-rw-r--r--kview/kviewcanvas/test/test.h2
10 files changed, 41 insertions, 61 deletions
diff --git a/kview/kviewcanvas/ChangeLog b/kview/kviewcanvas/ChangeLog
index 73d74094..2d2ccd65 100644
--- a/kview/kviewcanvas/ChangeLog
+++ b/kview/kviewcanvas/ChangeLog
@@ -14,5 +14,3 @@
* kimagecanvas.{h,cpp}:
New method boundImageTo( QSize ). Fits the image into the
requested width and height.
-
-# vim: sw=4 ts=4 tw=80 noet
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index 55efba65..90f443d3 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -25,7 +25,7 @@
#include <tqframe.h>
#include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kcolorbutton.h>
#include <tdelistview.h>
#include <knuminput.h>
@@ -56,17 +56,17 @@ KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQS
m_items.append( item );
}
- connect( m_pWidget->m_pListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_pListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, TQT_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, TQ_SLOT( configChanged() ) );
- connect( m_pWidget->m_pSmoothScaling, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_pKeepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_pCenterImage, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_bgColor, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_pMinWidth, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_pMaxWidth, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_pMinHeight, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) );
- connect( m_pWidget->m_pMaxHeight, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pSmoothScaling, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pKeepRatio, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pCenterImage, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_bgColor, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pMinWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pMaxWidth, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pMinHeight, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) );
+ connect( m_pWidget->m_pMaxHeight, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) );
load();
}
@@ -139,7 +139,4 @@ void KViewCanvasConfig::configChanged()
{
emit changed( true );
}
-
-// vim:sw=4:ts=4
-
#include "confmodules.moc"
diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h
index eaf40539..8458c6b7 100644
--- a/kview/kviewcanvas/config/confmodules.h
+++ b/kview/kviewcanvas/config/confmodules.h
@@ -28,7 +28,7 @@ class TDEConfig;
class KViewCanvasConfig : public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
@@ -46,7 +46,4 @@ class KViewCanvasConfig : public TDECModule
GeneralConfigWidget * m_pWidget;
TQPtrList<TQCheckListItem> m_items;
};
-
-// vim:sw=4:ts=4
-
#endif // CONFMODULES_H
diff --git a/kview/kviewcanvas/config/defaults.h b/kview/kviewcanvas/config/defaults.h
index 4d309585..38ed2c83 100644
--- a/kview/kviewcanvas/config/defaults.h
+++ b/kview/kviewcanvas/config/defaults.h
@@ -42,5 +42,3 @@ namespace Defaults {
}
#endif // DEFAULTS_H
-
-// vim: sw=4 ts=4
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index 32260a45..95406913 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -71,19 +71,19 @@ KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQString
setMinimumSize( 0, 0 );
setBgColor( Defaults::bgColor );
- connect( this, TQT_SIGNAL( imageChanged() ), this, TQT_SLOT( slotImageChanged() ) );
- connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( hideCursor() ) );
+ connect( this, TQ_SIGNAL( imageChanged() ), this, TQ_SLOT( slotImageChanged() ) );
+ connect( m_pTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( hideCursor() ) );
KSettings::Dispatcher::self()->registerInstance(
- KImageCanvasFactory::instance(), TQT_TQOBJECT(this),
- TQT_SLOT( loadSettings() ) );
+ KImageCanvasFactory::instance(), this,
+ TQ_SLOT( loadSettings() ) );
viewport()->setFocusProxy( this );
clear();
TQWidget::setMouseTracking( true );
viewport()->setMouseTracking( true );
- m_cursor.setShape( Qt::CrossCursor );
+ m_cursor.setShape( TQt::CrossCursor );
viewport()->setCursor( m_cursor );
m_pTimer->start( MOUSECURSORHIDETIME, true );
@@ -326,8 +326,8 @@ TQString KImageCanvas::blendEffectDescription( unsigned int idx ) const
bool KImageCanvas::eventFilter( TQObject * obj, TQEvent * ev )
{
- if( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_client) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_oldClient) ) && ev->type() == TQEvent::MouseMove )
- mouseMoveEvent( TQT_TQMOUSEEVENT( ev ) );
+ if( ( obj == m_client || obj == m_oldClient ) && ev->type() == TQEvent::MouseMove )
+ mouseMoveEvent( static_cast<TQMouseEvent*>( ev ) );
return TQScrollView::eventFilter( obj, ev );
}
@@ -517,7 +517,7 @@ void KImageCanvas::updateImage()
{
kdDebug( 4620 ) << k_funcinfo << endl;
if( ! m_bImageUpdateScheduled )
- TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateImage() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateImage() ) );
m_bImageUpdateScheduled = true;
}
@@ -589,7 +589,7 @@ void KImageCanvas::mouseMoveEvent( TQMouseEvent * )
{
if( m_cursor.shape() == TQt::BlankCursor )
{
- m_cursor.setShape( Qt::CrossCursor );
+ m_cursor.setShape( TQt::CrossCursor );
viewport()->setCursor( m_cursor );
if( m_client )
m_client->setCursor( m_cursor );
@@ -607,7 +607,7 @@ void KImageCanvas::resizeEvent( TQResizeEvent * ev )
void KImageCanvas::contentsMousePressEvent( TQMouseEvent * ev )
{
- if ( ev->button() == Qt::RightButton )
+ if ( ev->button() == TQt::RightButton )
emit contextPress( ev->globalPos() );
TQScrollView::contentsMousePressEvent( ev );
}
@@ -772,7 +772,7 @@ void KImageCanvas::timerEvent( TQTimerEvent * ev )
void KImageCanvas::hideCursor()
{
kdDebug( 4620 ) << k_funcinfo << endl;
- m_cursor.setShape( Qt::BlankCursor );
+ m_cursor.setShape( TQt::BlankCursor );
viewport()->setCursor( m_cursor );
if( m_client )
m_client->setCursor( m_cursor );
@@ -935,19 +935,17 @@ KImageHolder * KImageCanvas::createNewClient()
client->setMouseTracking( true );
client->installEventFilter( this );
setFocusProxy( client );
- client->setFocusPolicy( TQ_StrongFocus );
+ client->setFocusPolicy( TQWidget::StrongFocus );
client->setFocus();
addChild( client, 0, 0 );
- connect( client, TQT_SIGNAL( contextPress( const TQPoint& ) ), TQT_SIGNAL( contextPress( const TQPoint& ) ) );
- connect( client, TQT_SIGNAL( cursorPos( const TQPoint & ) ), TQT_SLOT( mapCursorPos( const TQPoint & ) ) );
- connect( client, TQT_SIGNAL( selected( const TQRect & ) ), TQT_SLOT( selected( const TQRect & ) ) );
- connect( client, TQT_SIGNAL( wannaScroll( int, int ) ), TQT_SLOT( scrollBy( int, int ) ) );
+ connect( client, TQ_SIGNAL( contextPress( const TQPoint& ) ), TQ_SIGNAL( contextPress( const TQPoint& ) ) );
+ connect( client, TQ_SIGNAL( cursorPos( const TQPoint & ) ), TQ_SLOT( mapCursorPos( const TQPoint & ) ) );
+ connect( client, TQ_SIGNAL( selected( const TQRect & ) ), TQ_SLOT( selected( const TQRect & ) ) );
+ connect( client, TQ_SIGNAL( wannaScroll( int, int ) ), TQ_SLOT( scrollBy( int, int ) ) );
return client;
}
#include "kimagecanvas.moc"
-
-// vim:sw=4:ts=4
diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h
index 39ff28b6..692e8625 100644
--- a/kview/kviewcanvas/kimagecanvas.h
+++ b/kview/kviewcanvas/kimagecanvas.h
@@ -27,7 +27,7 @@
#include <tqcursor.h>
#include <tqrect.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
class KImageHolder;
class TQColor;
@@ -39,9 +39,9 @@ class KPixmap;
* @author Matthias Kretz <kretz@kde.org>
* @version $Id$
*/
-class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
+class TDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -147,7 +147,7 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
/**
* @return a pointer to the TQWidget interface of this object
*/
- TQWidget * widget() { return static_cast<TQWidget *>( this ); }
+ TQWidget * widget() { return this; }
bool eventFilter( TQObject *, TQEvent * );
@@ -361,7 +361,4 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
TQRect m_selection; //unzoomed selection rect
};
-
-// vim:sw=4:ts=4
-
#endif // _KIMAGECANVAS_H
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index b34cfab2..7a0e35ba 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -64,7 +64,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
{
//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
// if the right mouse button is pressed emit the contextPress signal
- if ( ev->button() == Qt::RightButton )
+ if ( ev->button() == TQt::RightButton )
{
emit contextPress( mapToGlobal( ev->pos() ) );
return;
@@ -73,7 +73,7 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
if( m_pPixmap == 0 )
return;
- if( ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton )
+ if( ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton )
{
m_scrollpos = ev->globalPos();
m_selectionStartPoint = ev->pos();
@@ -83,13 +83,13 @@ void KImageHolder::mousePressEvent( TQMouseEvent *ev )
void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
{
//FIXME: when scrolling the cursorpos shouldn't change
- if( TQT_TQRECT_OBJECT(this->rect()).contains( ev->pos(), false ) )
+ if( this->rect().contains( ev->pos(), false ) )
emit cursorPos( ev->pos() );
//kdDebug( 4620 ) << k_funcinfo << " ev->state() = " << ev->state() << endl;
- if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )
+ if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton )
{
// scroll when a modifier and left button or the middle button is pressed
- if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & Qt::MidButton )
+ if( ev->state() & AltButton || ev->state() & ControlButton || ev->state() & ShiftButton || ev->state() & TQt::MidButton )
{
TQPoint difference = m_scrollpos - ev->globalPos();
emit wannaScroll( difference.x(), difference.y() );
@@ -181,7 +181,7 @@ void KImageHolder::mouseReleaseEvent( TQMouseEvent * ev )
m_scrollTimerId = 0;
}
}
- if( ev->state() & Qt::LeftButton || ev->state() & Qt::MidButton )
+ if( ev->state() & TQt::LeftButton || ev->state() & TQt::MidButton )
if( m_bSelecting )
m_bSelecting = false;
else
@@ -367,5 +367,3 @@ const KPixmap & KImageHolder::checkboardPixmap()
}
#include "kimageholder.moc"
-
-// vim:sw=4:ts=4
diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h
index c33073a8..ef28ad3b 100644
--- a/kview/kviewcanvas/kimageholder.h
+++ b/kview/kviewcanvas/kimageholder.h
@@ -34,7 +34,7 @@ class TQPoint;
*/
class KImageHolder : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KImageHolder( TQWidget *parent = 0, const char * name = 0 );
@@ -100,7 +100,4 @@ class KImageHolder : public TQWidget
KPixmap * m_pDoubleBuffer;
KPixmap * m_pCheckboardPixmap;
};
-
-// vim:sw=4:ts=4
-
#endif // _KIMAGEHOLDER_H
diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp
index de1694f8..9fae6f82 100644
--- a/kview/kviewcanvas/test/test.cpp
+++ b/kview/kviewcanvas/test/test.cpp
@@ -26,7 +26,7 @@ KImageViewerTest::KImageViewerTest()
else
{
KMessageBox::error(this, "Could not find our Part!");
- kapp->quit();
+ tdeApp->quit();
}
}
diff --git a/kview/kviewcanvas/test/test.h b/kview/kviewcanvas/test/test.h
index e88ebd15..18dace8b 100644
--- a/kview/kviewcanvas/test/test.h
+++ b/kview/kviewcanvas/test/test.h
@@ -12,7 +12,7 @@ namespace KImageViewer { class Canvas; };
class KImageViewerTest : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
KImageViewerTest();
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 02:45:43 +0000