summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-19 18:44:25 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-19 18:44:25 +0000
commit5f63ee9f50176245bca319e902b2b8575cd0074f (patch)
treed204c0e259fa5752fcbc514e7d28a0dd3a3c88ed
parentec393a9747d375a76912b3153818e026c4659413 (diff)
downloadtdegraphics-5f63ee9f50176245bca319e902b2b8575cd0074f.tar.gz
tdegraphics-5f63ee9f50176245bca319e902b2b8575cd0074f.zip
Rename tqgeometry* to geometry*
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1242307 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kolourpaint/kpmainwindow_view.cpp12
-rw-r--r--kuickshow/src/imlibwidget.cpp6
-rw-r--r--kuickshow/src/imlibwidget.h6
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;