TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 13 deletions

diff --git a/ksysv/kscroller.cpp b/ksysv/kscroller.cpp
index fc71368..4ac01cc 100644
--- a/ksysv/kscroller.cpp
+++ b/ksysv/kscroller.cpp
@@ -23,11 +23,11 @@ public:
   TQWidget* setCornerWidget;
 };
 
-KScroller::KScroller (TQWidget* parent, const char* name)
-  : TQFrame (parent, name),
+KScroller::KScroller (TQWidget* tqparent, const char* name)
+  : TQFrame (tqparent, name),
     d (new KScrollerPrivate()),
-    mVertical (new TQScrollBar (TQScrollBar::Vertical, this)),
-    mHorizontal (new TQScrollBar (TQScrollBar::Horizontal, this)),
+    mVertical (new TQScrollBar (Qt::Vertical, this)),
+    mHorizontal (new TQScrollBar (Qt::Horizontal, this)),
     mCornerWidget (new TQWidget (this)),
     mContent (0L),
     mVerticalOld (0),
@@ -77,18 +77,18 @@ void KScroller::resizeEvent (TQResizeEvent* e)
   updateScrollBars();
 }
 
-TQSize KScroller::minimumSizeHint() const
+TQSize KScroller::tqminimumSizeHint() const
 {
-  TQSize size = sizeHint();
+  TQSize size = tqsizeHint();
   if (size.width() > 300)
      size.setWidth(300);
   return size;
 }
 
-TQSize KScroller::sizeHint() const
+TQSize KScroller::tqsizeHint() const
 {
-  TQSize size = mContent->minimumSize();
-  int extra = kapp->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+  TQSize size = mContent->tqminimumSize();
+  int extra = kapp->tqstyle().tqpixelMetric( 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->minimumSize();
+  TQSize cs = mContent->tqminimumSize();
 
   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->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().tqpixelMetric( 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->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().tqpixelMetric( 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->style().pixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
+      int extra = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent, 0 );
 
       mCornerWidget->raise();
       mCornerWidget->setGeometry (w - extra, h - extra, extra, extra);