1 files changed, 10 insertions, 10 deletions
diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index 986e805..e2b4b30 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -1,7 +1,7 @@
 // (c) 2000 Peter Putzer
 
 #include <tqscrollbar.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstyle.h>
 
 #include <kdebug.h>
@@ -77,18 +77,18 @@ void KScroller::resizeEvent (TQResizeEvent* e)
   updateScrollBars();
 }
 
-TQSize KScroller::tqminimumSizeHint() const
+TQSize KScroller::minimumSizeHint() const
 {
-  TQSize size = tqsizeHint();
+  TQSize size = sizeHint();
   if (size.width() > 300)
      size.setWidth(300);
   return size;
 }
 
-TQSize KScroller::tqsizeHint() const
+TQSize KScroller::sizeHint() const
 {
-  TQSize size = mContent->tqminimumSize();
-  int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+  TQSize size = mContent->minimumSize();
+  int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
   size += TQSize( extra, extra );
   return size;
 }
@@ -97,7 +97,7 @@ void KScroller::updateScrollBars ()
 {
   int w = width();
   int h = height();
-  TQSize cs = mContent->tqminimumSize();
+  TQSize cs = mContent->minimumSize();
 
   setupVertical ( cs.width(), cs.height(), w, h);
   setupHorizontal ( cs.width(), cs.height(), w, h);
@@ -113,7 +113,7 @@ void KScroller::setupHorizontal (int cw, int, int w, int h)
 
   if (cw > w)
     {
-      int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
 
       if (!mVertical->isHidden())
         w -= extra;
@@ -139,7 +139,7 @@ void KScroller::setupVertical (int, int ch, int w, int h)
 
   if (ch > h)
     {
-      int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
       mVertical->setRange (0, ch - h);
       mVertical->setPageStep (h);
       mVertical->setLineStep (25);
@@ -175,7 +175,7 @@ void KScroller::setupCornerWidget (int w, int h)
 {
   if (!mVertical->isHidden() && !mHorizontal->isHidden())
     {
-      int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
 
       mCornerWidget->raise();
       mCornerWidget->setGeometry (w - extra, h - extra, extra, extra);