From 73cc29bc4e6ae64b39c59211cc105383cb9e4b96 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 18 Jul 2011 05:24:10 +0000 Subject: Rename tqsizeHint* to sizeHint* git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1241971 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ksysguard/gui/ksysguard.cc | 2 +- kwin/geometrytip.cpp | 10 +++++----- kwin/geometrytip.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 19beba19d..570f32e90 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -140,7 +140,7 @@ TopLevel::TopLevel( const char *name ) new KAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); - // TODO remove resize and fix so tqsizeHints() determines default size. + // TODO remove resize and fix so sizeHints() determines default size. if (!initialGeometrySet()) resize( 640, 480 ); setupGUI(ToolBar | Keys | StatusBar | Create); diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp index e0d1b865c..8fb92dc49 100644 --- a/kwin/geometrytip.cpp +++ b/kwin/geometrytip.cpp @@ -21,7 +21,7 @@ GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): setLineWidth(1); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); tqsetAlignment( AlignCenter | AlignTop ); - tqsizeHints = xSizeHints; + sizeHints = xSizeHints; if( save_under ) { XSetWindowAttributes attr; @@ -39,12 +39,12 @@ void GeometryTip::setGeometry( const TQRect& geom ) int w = geom.width(); int h = geom.height(); - if (tqsizeHints) + if (sizeHints) { - if (tqsizeHints->flags & PResizeInc) + if (sizeHints->flags & PResizeInc) { - w = ( w - tqsizeHints->base_width ) / tqsizeHints->width_inc; - h = ( h - tqsizeHints->base_height ) / tqsizeHints->height_inc; + w = ( w - sizeHints->base_width ) / sizeHints->width_inc; + h = ( h - sizeHints->base_height ) / sizeHints->height_inc; } } diff --git a/kwin/geometrytip.h b/kwin/geometrytip.h index 8e8dc531a..a9c194250 100644 --- a/kwin/geometrytip.h +++ b/kwin/geometrytip.h @@ -26,7 +26,7 @@ class GeometryTip: public TQLabel void setGeometry( const TQRect& geom ); private: - const XSizeHints* tqsizeHints; + const XSizeHints* sizeHints; }; } // namespace -- cgit v1.2.1