From 5f63ee9f50176245bca319e902b2b8575cd0074f Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 19 Jul 2011 18:44:25 +0000 Subject: Rename tqgeometry* to geometry* git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1242307 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kolourpaint/kpmainwindow_view.cpp | 12 ++++++------ kuickshow/src/imlibwidget.cpp | 6 +++--- kuickshow/src/imlibwidget.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kolourpaint/kpmainwindow_view.cpp b/kolourpaint/kpmainwindow_view.cpp index b1fbdf67..ee8a0aff 100644 --- a/kolourpaint/kpmainwindow_view.cpp +++ b/kolourpaint/kpmainwindow_view.cpp @@ -1095,21 +1095,21 @@ void kpMainWindow::updateThumbnail () const int margin = 20; const int initialWidth = 160, initialHeight = 120; - TQRect tqgeometryRect (width () - initialWidth - margin * 2, + TQRect geometryRect (width () - initialWidth - margin * 2, m_scrollView->y () + margin, initialWidth, initialHeight); #if DEBUG_KP_MAIN_WINDOW - kdDebug () << "\t\tcreating tqgeometry=" << tqgeometryRect << endl; + kdDebug () << "\t\tcreating tqgeometry=" << geometryRect << endl; #endif - tqgeometryRect = mapToGlobal (tqgeometryRect); + geometryRect = mapToGlobal (geometryRect); #if DEBUG_KP_MAIN_WINDOW - kdDebug () << "\t\tmap to global=" << tqgeometryRect << endl; + kdDebug () << "\t\tmap to global=" << geometryRect << endl; #endif - m_thumbnail->resize (tqgeometryRect.size ()); - m_thumbnail->move (tqgeometryRect.topLeft ()); + m_thumbnail->resize (geometryRect.size ()); + m_thumbnail->move (geometryRect.topLeft ()); } } diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index ee890f4c..c14ca983 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -436,17 +436,17 @@ void ImlibWidget::setFlipMode( int mode ) } -void ImlibWidget::updateWidget( bool tqgeometryUpdate ) +void ImlibWidget::updateWidget( bool geometryUpdate ) { if ( !m_kuim ) return; -// if ( tqgeometryUpdate ) +// if ( geometryUpdate ) // XUnmapWindow( x11Display(), win );// remove the old image -> no flicker XSetWindowBackgroundPixmap( x11Display(), win, m_kuim->pixmap() ); - if ( tqgeometryUpdate ) + if ( geometryUpdate ) updateGeometry( m_kuim->width(), m_kuim->height() ); XClearWindow( x11Display(), win ); diff --git a/kuickshow/src/imlibwidget.h b/kuickshow/src/imlibwidget.h index a83f8eb4..a2105531 100644 --- a/kuickshow/src/imlibwidget.h +++ b/kuickshow/src/imlibwidget.h @@ -138,7 +138,7 @@ protected: void showImage(); void setImageModifier(); void rotate( int ); - void updateWidget( bool tqgeometryUpdate=true ); + void updateWidget( bool geometryUpdate=true ); virtual void updateGeometry( int width, int height ); virtual void loaded( KuickImage * ); virtual bool canZoomTo( int newWidth, int newHeight ); @@ -146,9 +146,9 @@ protected: void closeEvent( TQCloseEvent * ); - inline void autoUpdate( bool tqgeometryUpdate=false ) { + inline void autoUpdate( bool geometryUpdate=false ) { if ( isAutoRendering ) - updateWidget( tqgeometryUpdate ); + updateWidget( geometryUpdate ); } bool stillResizing, deleteImData, deleteImlibData; -- cgit v1.2.3