From bce8199ddac4feecdee9c094fb8f75863cfa9652 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kview/kviewcanvas/config/generalconfigwidget.ui | 4 ++-- kview/kviewcanvas/kimageholder.cpp | 10 +++++----- kview/kviewviewer/kviewviewer.cpp | 4 ++-- kview/kviewviewer/kviewviewer.h | 2 +- kview/kviewviewer/printimagesettings.ui | 4 ++-- kview/modules/presenter/imagelistdialog.ui | 4 ++-- kview/modules/presenter/kviewpresenter.cpp | 8 ++++---- kview/photobook/photobook.cpp | 4 ++-- kview/photobook/photobook.h | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kview') 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 kdialog.h - - + + knuminput.h knuminput.h 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; } diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index e566b74b..eb4adb13 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -55,10 +55,10 @@ typedef KParts::GenericFactory KViewViewerFactory; K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory ) -KViewViewer::KViewViewer( TQWidget *tqparentWidget, const char * /*widgetName*/, +KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *tqparent, const char *name, const TQStringList & ) : KImageViewer::Viewer( tqparent, name ) - , m_pParentWidget( tqparentWidget ) + , m_pParentWidget( parentWidget ) , m_pJob( 0 ) , m_pExtension( 0 ) , m_pCanvas( 0 ) diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index 1d79696e..f63808c8 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -49,7 +49,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf friend class KViewKonqExtension; public: - KViewViewer( TQWidget * tqparentWidget, const char * widgetName, + KViewViewer( TQWidget * parentWidget, const char * widgetName, TQObject * tqparent, const char * name, const TQStringList & ); virtual ~KViewViewer(); diff --git a/kview/kviewviewer/printimagesettings.ui b/kview/kviewviewer/printimagesettings.ui index 3c5418af..2eed3c78 100644 --- a/kview/kviewviewer/printimagesettings.ui +++ b/kview/kviewviewer/printimagesettings.ui @@ -180,8 +180,8 @@ kdialog.h - - + + tqwidget.h knuminput.h diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui index 2bc7206a..d56343dc 100644 --- a/kview/modules/presenter/imagelistdialog.ui +++ b/kview/modules/presenter/imagelistdialog.ui @@ -271,8 +271,8 @@ init() noSort() - - + + kdialog.h klistview.h diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index d85748c1..6b08593c 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -82,11 +82,11 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), m_paSlideshow, TQT_SLOT( setChecked( bool ) ) ); // search for file_open action - KXMLGUIClient * tqparentClient = static_cast( tqparent->qt_cast( "KXMLGUIClient" ) ); - if( tqparentClient ) + KXMLGUIClient * parentClient = static_cast( tqparent->qt_cast( "KXMLGUIClient" ) ); + if( parentClient ) { - m_paFileOpen = tqparentClient->actionCollection()->action( "file_open" ); - m_paFileClose = tqparentClient->actionCollection()->action( "file_close" ); + m_paFileOpen = parentClient->actionCollection()->action( "file_open" ); + m_paFileClose = parentClient->actionCollection()->action( "file_close" ); } if( m_paFileClose ) connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) ); diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index ce6c5d1e..8503188d 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -220,7 +220,7 @@ void PhotoBook::updateButton( bool nextExist, bool previousExit) K_EXPORT_COMPONENT_FACTORY(libphotobook, PhotoBookFactory ) PhotoBookPart::PhotoBookPart( - TQWidget *tqparentWidget, const char *widgetName, + TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& ) @@ -229,7 +229,7 @@ PhotoBookPart::PhotoBookPart( setInstance(PhotoBookFactory::instance()); new PhotoBookBrowserExtension(this); - bv = new PhotoBook(tqparentWidget, this, widgetName); + bv = new PhotoBook(parentWidget, this, widgetName); setWidget(bv); connect( diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index 3afbefdc..2ce243a9 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -115,7 +115,7 @@ Q_OBJECT public: PhotoBookPart( - TQWidget *tqparentWidget, const char *widgetName, + TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList() ); -- cgit v1.2.3