Browse Source

Fix remnant QMIN/QMAX to TQMIN/TQMAX.

Darrell Anderson 5 years ago
parent
commit
90f1f50f00
59 changed files with 177 additions and 177 deletions
  1. 1
    1
      kate/app/katefilelist.cpp
  2. 1
    1
      kate/app/katefileselector.cpp
  3. 1
    1
      kcontrol/background/bgmonitor.cpp
  4. 3
    3
      kcontrol/background/bgrender.cpp
  5. 1
    1
      kcontrol/background/bgwallpaper.cpp
  6. 1
    1
      kcontrol/clock/dtime.cpp
  7. 2
    2
      kcontrol/joystick/joywidget.cpp
  8. 2
    2
      kcontrol/kcontrol/main.cpp
  9. 1
    1
      kcontrol/kcontrol/moduletreeview.cpp
  10. 4
    4
      kcontrol/tdeio/ksaveioconfig.cpp
  11. 2
    2
      kdebugdialog/kabstractdebugdialog.cpp
  12. 6
    6
      kdesktop/kdiconview.cc
  13. 6
    6
      kfind/kfwin.cpp
  14. 1
    1
      khotkeys/shared/voicesignature.cpp
  15. 1
    1
      kicker/extensions/kasbar/kasbar.cpp
  16. 1
    1
      kicker/extensions/kasbar/kasloaditem.cpp
  17. 2
    2
      kicker/kicker/core/container_extension.cpp
  18. 4
    4
      kicker/kicker/core/containerarea.cpp
  19. 4
    4
      kicker/kicker/core/extensionmanager.cpp
  20. 1
    1
      kicker/kicker/ui/addapplet.cpp
  21. 1
    1
      kicker/kicker/ui/addappletvisualfeedback.cpp
  22. 6
    6
      kicker/kicker/ui/k_new_mnu.cpp
  23. 4
    4
      kicker/kicker/ui/kickoff_bar.cpp
  24. 1
    1
      kicker/libkicker/kickertip.cpp
  25. 1
    1
      kicker/libkicker/panelbutton.cpp
  26. 1
    1
      klipper/popupproxy.cpp
  27. 1
    1
      kmenuedit/menufile.cpp
  28. 4
    4
      konqueror/konq_combo.cc
  29. 21
    21
      konsole/konsole/TEScreen.cpp
  30. 6
    6
      konsole/konsole/TEWidget.cpp
  31. 2
    2
      konsole/konsole/TEmuVt102.cpp
  32. 2
    2
      konsole/konsole/session.cpp
  33. 1
    1
      ksplashml/main.cpp
  34. 1
    1
      ksplashml/themeengine/default/themelegacy.cpp
  35. 8
    8
      ksplashml/themeengine/standard/wndicon.cpp
  36. 1
    1
      ksplashml/themeengine/standard/wndstatus.cpp
  37. 13
    13
      libkonq/konq_iconviewwidget.cc
  38. 1
    1
      nsplugins/viewer/kxt.cpp
  39. 1
    1
      nsplugins/viewer/nsplugin.cpp
  40. 5
    5
      tdeioslave/pop3/pop3.cc
  41. 2
    2
      tdeioslave/thumbnail/textcreator.cpp
  42. 2
    2
      tdeioslave/thumbnail/thumbnail.cpp
  43. 2
    2
      tdesu/tdesud/repo.cpp
  44. 2
    2
      tdesu/tdesud/tdesud.cpp
  45. 1
    1
      tdm/kfrontend/kgverify.cpp
  46. 2
    2
      tdm/kfrontend/tdmclock.cpp
  47. 1
    1
      tdm/kfrontend/themer/tdmitem.cpp
  48. 2
    2
      twin/client.cpp
  49. 10
    10
      twin/clients/keramik/keramik.cpp
  50. 3
    3
      twin/clients/plastik/plastik.cpp
  51. 1
    1
      twin/clients/plastik/plastikbutton.cpp
  52. 2
    2
      twin/clients/web/Web.cpp
  53. 10
    10
      twin/geometry.cpp
  54. 1
    1
      twin/geometrytip.cpp
  55. 1
    1
      twin/kcmtwin/twinoptions/windows.cpp
  56. 2
    2
      twin/lib/kcommondecoration.cpp
  57. 2
    2
      twin/placement.cpp
  58. 1
    1
      twin/rules.cpp
  59. 4
    4
      twin/tabbox.cpp

+ 1
- 1
kate/app/katefilelist.cpp View File

@@ -588,7 +588,7 @@ void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, i
588 588
         int v = hc-m_viewhistpos;
589 589
         int e = ec-m_edithistpos+1;
590 590
         e = e*e;
591
-        int n = QMAX(v + e, 1);
591
+        int n = TQMAX(v + e, 1);
592 592
         shade.setRgb(
593 593
             ((shade.red()*v) + (eshade.red()*e))/n,
594 594
             ((shade.green()*v) + (eshade.green()*e))/n,

+ 1
- 1
kate/app/katefileselector.cpp View File

@@ -488,7 +488,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
488 488
   TQListBox *lb = cmbPath->listBox();
489 489
   if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) {
490 490
     int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
491
-    int w = QMIN( mainwin->width(), lb->contentsWidth() + add );
491
+    int w = TQMIN( mainwin->width(), lb->contentsWidth() + add );
492 492
     lb->resize( w, lb->height() );
493 493
     // TODO - move the listbox to a suitable place if nessecary
494 494
     // TODO - decide if it is worth caching the size while untill the contents

+ 1
- 1
kcontrol/background/bgmonitor.cpp View File

@@ -100,7 +100,7 @@ void BGMonitorArrangement::updateArrangement()
100 100
     
101 101
     TQRect expandedOverallGeometry = expandToPreview(overallGeometry);
102 102
     
103
-    double scale = QMIN(
103
+    double scale = TQMIN(
104 104
                 double(width()) / double(expandedOverallGeometry.width()),
105 105
                 double(height()) / double(expandedOverallGeometry.height())
106 106
                        );

+ 3
- 3
kcontrol/background/bgrender.cpp View File

@@ -218,8 +218,8 @@ int KBackgroundRenderer::doBackground(bool quit)
218 218
 	int w = m_Background.width();
219 219
 	int h = m_Background.height();
220 220
 	if ((w > m_Size.width()) || (h > m_Size.height())) {
221
-	    w = QMIN(w, m_Size.width());
222
-	    h = QMIN(h, m_Size.height());
221
+	    w = TQMIN(w, m_Size.width());
222
+	    h = TQMIN(h, m_Size.height());
223 223
 	    m_Background = m_Background.copy(0, 0, w, h);
224 224
 	}
225 225
 	KImageEffect::flatten(m_Background, colorA(), colorB(), 0);
@@ -645,7 +645,7 @@ void KBackgroundRenderer::fullWallpaperBlend()
645 645
         for (int y = m_WallpaperRect.top(); y < m_WallpaperRect.bottom(); y += wh) {
646 646
 	    for (int x = m_WallpaperRect.left(); x < m_WallpaperRect.right(); x += ww) {
647 647
 		blend(m_Image, TQRect(x, y, ww, wh), m_Wallpaper,
648
-			TQPoint(-QMIN(x, 0), -QMIN(y, 0)), blendFactor);
648
+			TQPoint(-TQMIN(x, 0), -TQMIN(y, 0)), blendFactor);
649 649
 	    }
650 650
 	}
651 651
     }

+ 1
- 1
kcontrol/background/bgwallpaper.cpp View File

@@ -107,7 +107,7 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings,
107 107
    dlg->m_spinInterval->setSuffix(i18n(" min"));
108 108
 
109 109
    // Load
110
-   dlg->m_spinInterval->setValue(QMAX(1,m_pSettings->wallpaperChangeInterval()));
110
+   dlg->m_spinInterval->setValue(TQMAX(1,m_pSettings->wallpaperChangeInterval()));
111 111
 
112 112
    dlg->m_listImages->insertStringList(m_pSettings->wallpaperList());
113 113
 

+ 1
- 1
kcontrol/clock/dtime.cpp View File

@@ -381,7 +381,7 @@ void Kclock::paintEvent( TQPaintEvent * )
381 381
 
382 382
   TQPointArray pts;
383 383
   TQPoint cp = rect().center();
384
-  int d = QMIN(width(),height());
384
+  int d = TQMIN(width(),height());
385 385
   TQColor hands =  colorGroup().dark();
386 386
   TQColor shadow =  colorGroup().text();
387 387
   paint.setPen( shadow );

+ 2
- 2
kcontrol/joystick/joywidget.cpp View File

@@ -87,7 +87,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
87 87
 
88 88
   // calculate the column width we need
89 89
   TQFontMetrics fm(font());
90
-  int colWidth = QMAX(fm.width(PRESSED), fm.width("-32767")) + 10;  // -32767 largest string
90
+  int colWidth = TQMAX(fm.width(PRESSED), fm.width("-32767")) + 10;  // -32767 largest string
91 91
 
92 92
   new TQLabel(i18n("Buttons:"), vboxMid);
93 93
   buttonTbl = new TQTable(0, 1, vboxMid);
@@ -282,7 +282,7 @@ void JoyWidget::showDeviceProps(JoyDevice *joy)
282 282
   idle->start(0);
283 283
 
284 284
   // make both tables use the same space for header; this looks nicer
285
-  buttonTbl->setLeftMargin(QMAX(buttonTbl->verticalHeader()->width(),
285
+  buttonTbl->setLeftMargin(TQMAX(buttonTbl->verticalHeader()->width(),
286 286
                                   axesTbl->verticalHeader()->width()));
287 287
   axesTbl->setLeftMargin(buttonTbl->verticalHeader()->width());
288 288
 }

+ 2
- 2
kcontrol/kcontrol/main.cpp View File

@@ -78,9 +78,9 @@ KControlApp::KControlApp()
78 78
   if (fontSize == 0)
79 79
     fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
80 80
   int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), 
81
-			       QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
81
+			       TQMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
82 82
   int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), 
83
-			       QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
83
+			       TQMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
84 84
   toplevel->resize(x,y);
85 85
 }
86 86
 

+ 1
- 1
kcontrol/kcontrol/moduletreeview.cpp View File

@@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem>
166 166
 {
167 167
   while (item)
168 168
     {
169
-      setOpen(item, parentList-.contains(item));
169
+      setOpen(item, parentList->contains(item));
170 170
 
171 171
           if (item->childCount() != 0)
172 172
                 expandItem(item->firstChild(), parentList);

+ 4
- 4
kcontrol/tdeio/ksaveioconfig.cpp View File

@@ -83,7 +83,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout )
83 83
 {
84 84
   TDEConfig* cfg = config ();
85 85
   cfg->setGroup( TQString() );
86
-  cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
86
+  cfg->writeEntry("ReadTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
87 87
   cfg->sync();
88 88
 }
89 89
 
@@ -91,7 +91,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout )
91 91
 {
92 92
   TDEConfig* cfg = config ();
93 93
   cfg->setGroup( TQString() );
94
-  cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
94
+  cfg->writeEntry("ConnectTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
95 95
   cfg->sync();
96 96
 }
97 97
 
@@ -99,7 +99,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout )
99 99
 {
100 100
   TDEConfig* cfg = config ();
101 101
   cfg->setGroup( TQString() );
102
-  cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
102
+  cfg->writeEntry("ProxyConnectTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
103 103
   cfg->sync();
104 104
 }
105 105
 
@@ -107,7 +107,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout )
107 107
 {
108 108
   TDEConfig* cfg = config ();
109 109
   cfg->setGroup( TQString() );
110
-  cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout));
110
+  cfg->writeEntry("ResponseTimeout", TQMAX(MIN_TIMEOUT_VALUE,_timeout));
111 111
   cfg->sync();
112 112
 }
113 113
 

+ 2
- 2
kdebugdialog/kabstractdebugdialog.cpp View File

@@ -55,9 +55,9 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
55 55
   int w1 = pHelpButton->sizeHint().width();
56 56
   int w2 = pOKButton->sizeHint().width();
57 57
   int w3 = pCancelButton->sizeHint().width();
58
-  int w4 = QMAX( w1, QMAX( w2, w3 ) );
58
+  int w4 = TQMAX( w1, TQMAX( w2, w3 ) );
59 59
   int w5 = pApplyButton->sizeHint().width();
60
-  w4 = QMAX(w4, w5);
60
+  w4 = TQMAX(w4, w5);
61 61
 
62 62
   pHelpButton->setFixedWidth( w4 );
63 63
   pOKButton->setFixedWidth( w4 );

+ 6
- 6
kdesktop/kdiconview.cc View File

@@ -494,7 +494,7 @@ void KDIconView::setAutoAlign( bool b )
494 494
     if ( b ) {
495 495
         // set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
496 496
         int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
497
-        setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
497
+        setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
498 498
         setFont( font() );  // Force calcRect()
499 499
 
500 500
         if (!KRootWm::self()->startup) {
@@ -509,7 +509,7 @@ void KDIconView::setAutoAlign( bool b )
509 509
     else {
510 510
         // change maxItemWidth, because when grid-align was active, it changed this for the grid
511 511
         int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
512
-        setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
512
+        setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
513 513
         setFont( font() );  // Force calcRect()
514 514
 
515 515
         disconnect( this, TQT_SIGNAL( iconMoved() ),
@@ -2001,8 +2001,8 @@ TQPoint KDIconView::findPlaceForIcon( int column, int row, const TQRect &current
2001 2001
     int dx = gridXValue(), dy = 0;
2002 2002
     TQIconViewItem *item = firstItem();
2003 2003
     for ( ; item; item = item->nextItem() ) {
2004
-        dx = QMAX( dx, item->width() );
2005
-        dy = QMAX( dy, item->height() );
2004
+        dx = TQMAX( dx, item->width() );
2005
+        dy = TQMAX( dy, item->height() );
2006 2006
     }
2007 2007
 
2008 2008
     dx += spacing();
@@ -2016,7 +2016,7 @@ TQPoint KDIconView::findPlaceForIcon( int column, int row, const TQRect &current
2016 2016
             delta++;
2017 2017
             res = findPlaceForIconCol(column + (delta / 2) * (-2 * (delta % 2) + 1),
2018 2018
                                       dx, dy, currentIconArea);
2019
-            if (delta / 2 > QMAX(max_cols - column, column))
2019
+            if (delta / 2 > TQMAX(max_cols - column, column))
2020 2020
                 return res;
2021 2021
         } while (res.isNull());
2022 2022
         return res;
@@ -2030,7 +2030,7 @@ TQPoint KDIconView::findPlaceForIcon( int column, int row, const TQRect &current
2030 2030
             delta++;
2031 2031
             res = findPlaceForIconRow(row + (delta / 2) * (-2 * (delta % 2) + 1),
2032 2032
                                       dx, dy, currentIconArea);
2033
-            if (delta / 2 > QMAX(max_rows - row, row))
2033
+            if (delta / 2 > TQMAX(max_rows - row, row))
2034 2034
                 return res;
2035 2035
         } while (res.isNull());
2036 2036
         return res;

+ 6
- 6
kfind/kfwin.cpp View File

@@ -370,20 +370,20 @@ void KfindWindow::resetColumns(bool init)
370 370
    TQFontMetrics fm = fontMetrics();
371 371
   if (init)
372 372
   {
373
-    setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
373
+    setColumnWidth(2, TQMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
374 374
     TQString sampleDate =
375 375
       TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
376
-    setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
377
-    setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
378
-    setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
376
+    setColumnWidth(3, TQMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
377
+    setColumnWidth(4, TQMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
378
+    setColumnWidth(5, TQMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
379 379
   }
380 380
 
381 381
   int free_space = visibleWidth() -
382 382
     columnWidth(2) - columnWidth(3) - columnWidth(4) - columnWidth(5);
383 383
 
384
-//  int name_w = QMIN((int)(free_space*0.5), 150);
384
+//  int name_w = TQMIN((int)(free_space*0.5), 150);
385 385
 //  int dir_w = free_space - name_w;
386
-  int name_w = QMAX((int)(free_space*0.5), fm.width("some long filename"));
386
+  int name_w = TQMAX((int)(free_space*0.5), fm.width("some long filename"));
387 387
   int dir_w = name_w;
388 388
 
389 389
   setColumnWidth(0, name_w);

+ 1
- 1
khotkeys/shared/voicesignature.cpp View File

@@ -374,7 +374,7 @@ float VoiceSignature::diff(const VoiceSignature &s1, const VoiceSignature &s2)
374 374
 			d+= d1*d1;//*pond[x][y];
375 375
 		}
376 376
 		d=sqrt(d);
377
-		g[i][j]=QMIN(QMIN( g[i-1][j]+d, g[i][j-1]+d )  ,  g[i-1][j-1]+d+d  );
377
+		g[i][j]=TQMIN(TQMIN( g[i-1][j]+d, g[i][j-1]+d )  ,  g[i-1][j-1]+d+d  );
378 378
 	}
379 379
 
380 380
 	return g[I][J]/(I+J);	

+ 1
- 1
kicker/extensions/kasbar/kasbar.cpp View File

@@ -299,7 +299,7 @@ void KasBar::setMaxBoxes( int count )
299 299
 
300 300
 void KasBar::setBoxesPerLine( int count )
301 301
 {
302
-   boxesPerLine_ = QMIN( count, maxBoxes_ );
302
+   boxesPerLine_ = TQMIN( count, maxBoxes_ );
303 303
    updateLayout();
304 304
 }
305 305
 

+ 1
- 1
kicker/extensions/kasbar/kasloaditem.cpp View File

@@ -70,7 +70,7 @@ void KasLoadItem::paint( TQPainter *p )
70 70
 {
71 71
     double val = valuesOne.last();
72 72
     double maxValue = 1.0;
73
-    double scaleVal = QMAX( val, valuesFive.last() );
73
+    double scaleVal = TQMAX( val, valuesFive.last() );
74 74
 
75 75
     if ( scaleVal >= maxValue )
76 76
 	maxValue = 2.0;

+ 2
- 2
kicker/kicker/core/container_extension.cpp View File

@@ -1797,7 +1797,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA
1797 1797
 
1798 1798
         if (m_settings.expandSize())
1799 1799
         {
1800
-            height = QMAX(height, hint.height());
1800
+            height = TQMAX(height, hint.height());
1801 1801
         }
1802 1802
     }
1803 1803
     else
@@ -1807,7 +1807,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA
1807 1807
 
1808 1808
         if (m_settings.expandSize())
1809 1809
         {
1810
-            width = QMAX( width, hint.width() );
1810
+            width = TQMAX( width, hint.width() );
1811 1811
         }
1812 1812
     }
1813 1813
 

+ 4
- 4
kicker/kicker/core/containerarea.cpp View File

@@ -1611,8 +1611,8 @@ void ContainerArea::moveDragIndicator(int pos)
1611 1611
         {
1612 1612
             int newX = pos;
1613 1613
             _dragIndicator->resize(_dragIndicator->preferredSize());
1614
-            newX = QMAX(newX, availableSpace.left());
1615
-            newX = QMIN(newX,
1614
+            newX = TQMAX(newX, availableSpace.left());
1615
+            newX = TQMIN(newX,
1616 1616
                 availableSpace.right() + 1 - _dragIndicator->width() );
1617 1617
             _dragIndicator->move(newX, availableSpace.top());
1618 1618
         }
@@ -1629,8 +1629,8 @@ void ContainerArea::moveDragIndicator(int pos)
1629 1629
         {
1630 1630
             int newY = pos;
1631 1631
             _dragIndicator->resize(_dragIndicator->preferredSize());
1632
-            newY = QMAX(newY, availableSpace.top());
1633
-            newY = QMIN(newY,
1632
+            newY = TQMAX(newY, availableSpace.top());
1633
+            newY = TQMIN(newY,
1634 1634
                 availableSpace.bottom() + 1 - _dragIndicator->height() );
1635 1635
             _dragIndicator->move(availableSpace.left(), newY);
1636 1636
         }

+ 4
- 4
kicker/kicker/core/extensionmanager.cpp View File

@@ -733,22 +733,22 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens
733 733
     {
734 734
         case KPanelExtension::Left:
735 735
         {
736
-            area.setLeft(QMAX(area.left(), geom.right()));
736
+            area.setLeft(TQMAX(area.left(), geom.right()));
737 737
             break;
738 738
         }
739 739
         case KPanelExtension::Right:
740 740
         {
741
-            area.setRight(QMIN(area.right(), geom.left()));
741
+            area.setRight(TQMIN(area.right(), geom.left()));
742 742
             break;
743 743
         }
744 744
         case KPanelExtension::Top:
745 745
         {
746
-            area.setTop(QMAX(area.top(), geom.bottom()));
746
+            area.setTop(TQMAX(area.top(), geom.bottom()));
747 747
             break;
748 748
         }
749 749
         case KPanelExtension::Bottom:
750 750
         {
751
-            area.setBottom(QMIN(area.bottom(), geom.top()));
751
+            area.setBottom(TQMIN(area.bottom(), geom.top()));
752 752
             break;
753 753
         }
754 754
         default: ;  // ignore KPanelExtension::Floating ... at least for now

+ 1
- 1
kicker/kicker/ui/addapplet.cpp View File

@@ -292,7 +292,7 @@ void AddAppletDialog::resizeAppletView()
292 292
         m_appletBox->layout()->activate();
293 293
         w = v->visibleWidth();
294 294
         h = m_appletBox->layout()->minimumSize().height();
295
-        v->resizeContents(w, QMAX(h, v->visibleHeight()));
295
+        v->resizeContents(w, TQMAX(h, v->visibleHeight()));
296 296
         if (w == m_appletBox->width() && h == m_appletBox->height())
297 297
         break;
298 298
         m_appletBox->resize(w, h);

+ 1
- 1
kicker/kicker/ui/addappletvisualfeedback.cpp View File

@@ -132,7 +132,7 @@ void AddAppletVisualFeedback::displayInternal()
132 132
     }
133 133
 
134 134
     int margin = KDialog::marginHint();
135
-    int height = QMAX(m_icon.height(), textRect.height()) + 2 * margin;
135
+    int height = TQMAX(m_icon.height(), textRect.height()) + 2 * margin;
136 136
     int textX = m_icon.isNull() ? margin : 2 + m_icon.width() + 2 * margin;
137 137
     int width = textX;
138 138
 

+ 6
- 6
kicker/kicker/ui/k_new_mnu.cpp View File

@@ -175,7 +175,7 @@ static int used_size( TQLabel *label, int oldsize )
175 175
 {
176 176
     TQSimpleRichText st( label->text(), TDEGlobalSettings::toolBarFont() );
177 177
     st.setWidth( oldsize );
178
-    return QMAX( st.widthUsed(), oldsize );
178
+    return TQMAX( st.widthUsed(), oldsize );
179 179
 }
180 180
 
181 181
 KMenu::KMenu()
@@ -3206,14 +3206,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e )
3206 3206
     if ( hasMouseTracking() && m_isresizing ) {
3207 3207
         m_stacker->setMinimumSize( TQSize(0, 0) );
3208 3208
         m_stacker->setMaximumSize( TQSize(32000, 32000) );
3209
-        int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() );
3209
+        int newWidth = TQMAX( e->x() - x(), minimumSizeHint().width() );
3210 3210
         if ( m_orientation == BottomUp ) {
3211
-          int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 );
3211
+          int newHeight = TQMAX( height() - e->y(), minimumSizeHint().height() + 10 );
3212 3212
           int newY = y() + height() - newHeight;
3213 3213
           setGeometry( x(), newY, newWidth, newHeight);
3214 3214
         }
3215 3215
         else {
3216
-          setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 ));
3216
+          setGeometry( x(), y(), newWidth, TQMAX( e->y(), minimumSizeHint().height() + 10 ));
3217 3217
         }
3218 3218
     }
3219 3219
 }
@@ -3392,9 +3392,9 @@ TQSize KMenu::minimumSizeHint() const
3392 3392
 {
3393 3393
     TQSize minsize;
3394 3394
     minsize.setWidth( minsize.width() + m_tabBar->minimumSizeHint().width()  );
3395
-    minsize.setWidth( QMAX( minsize.width(),
3395
+    minsize.setWidth( TQMAX( minsize.width(),
3396 3396
                             m_search->minimumSize().width() ) );
3397
-    minsize.setWidth( QMAX( minsize.width(),
3397
+    minsize.setWidth( TQMAX( minsize.width(),
3398 3398
                             m_search->minimumSize().width() ) );
3399 3399
 
3400 3400
     minsize.setHeight( minsize.height() +

+ 4
- 4
kicker/kicker/ui/kickoff_bar.cpp View File

@@ -171,10 +171,10 @@ TQSize KickoffTabBar::minimumSizeHint() const
171 171
         }
172 172
 
173 173
         // Final width for this tab
174
-        int w = QMAX(iw, fw) + hframe;
174
+        int w = TQMAX(iw, fw) + hframe;
175 175
 
176
-        mw = QMAX(mw, w);
177
-        mh = QMAX(mh, h);
176
+        mw = TQMAX(mw, w);
177
+        mh = TQMAX(mh, h);
178 178
     }
179 179
 
180 180
     s.setWidth(mw * count());
@@ -196,7 +196,7 @@ void KickoffTabBar::layoutTabs()
196 196
     for (int t = 0; t < count(); ++t) {
197 197
         TQTab* tab = tabAt(TQApplication::reverseLayout() ? count() - t - 1 : t);
198 198
 
199
-        int w = QMAX(st.width() / count(), parentWidget()->width() / count());
199
+        int w = TQMAX(st.width() / count(), parentWidget()->width() / count());
200 200
 
201 201
         TQRect r = tab->rect();
202 202
         tab->setRect(TQRect(TQPoint(x, 0), style().tqsizeFromContents(TQStyle::CT_TabBarTab, this,

+ 1
- 1
kicker/libkicker/kickertip.cpp View File

@@ -356,7 +356,7 @@ void KickerTip::displayInternal()
356 356
     }
357 357
 
358 358
     int margin = KDialog::marginHint();
359
-    int height = QMAX(m_icon.height(), textRect.height()) + 2 * margin;
359
+    int height = TQMAX(m_icon.height(), textRect.height()) + 2 * margin;
360 360
     int textX = m_icon.isNull() ? margin : 2 + m_icon.width() + 2 * margin;
361 361
     int width = textX + textRect.width() + margin;
362 362
     int textY = (height - textRect.height()) / 2;

+ 1
- 1
kicker/libkicker/panelbutton.cpp View File

@@ -292,7 +292,7 @@ int PanelButton::preferredDimension(int panelDim) const
292 292
         int newSize = preferredIconSize(panelDim);
293 293
         if (newSize > 0)
294 294
         {
295
-            return QMIN(panelDim, newSize + (KDialog::spacingHint() * 2));
295
+            return TQMIN(panelDim, newSize + (KDialog::spacingHint() * 2));
296 296
         }
297 297
     }
298 298
 

+ 1
- 1
klipper/popupproxy.cpp View File

@@ -135,7 +135,7 @@ int PopupProxy::insertFromSpill( int index ) {
135 135
     int count = 0;
136 136
     int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().height();
137 137
     // Force at least one item to be inserted.
138
-    remainingHeight = QMAX( remainingHeight, 0 );
138
+    remainingHeight = TQMAX( remainingHeight, 0 );
139 139
     for ( const HistoryItem* item = spillPointer.current();
140 140
           item && remainingHeight >= 0;
141 141
           nextItemNumber++, item = ++spillPointer )

+ 1
- 1
kmenuedit/menufile.cpp View File

@@ -399,7 +399,7 @@ void MenuFile::moveMenu(const TQString &oldMenu, const TQString &newMenu)
399 399
    TQStringList oldMenuParts = TQStringList::split('/', oldMenu);
400 400
    TQStringList newMenuParts = TQStringList::split('/', newMenu);
401 401
    TQString commonMenuName;
402
-   uint max = QMIN(oldMenuParts.count(), newMenuParts.count());
402
+   uint max = TQMIN(oldMenuParts.count(), newMenuParts.count());
403 403
    uint i = 0;
404 404
    for(; i < max; i++)
405 405
    {

+ 4
- 4
konqueror/konq_combo.cc View File

@@ -749,15 +749,15 @@ int KonqComboListBoxPixmap::height( const TQListBox* lb ) const
749 749
     if ( text().isEmpty() )
750 750
         h = pm.height();
751 751
     else
752
-        h = QMAX( pm.height(), lb->fontMetrics().lineSpacing() + 2 );
753
-    return QMAX( h, TQApplication::globalStrut().height() );
752
+        h = TQMAX( pm.height(), lb->fontMetrics().lineSpacing() + 2 );
753
+    return TQMAX( h, TQApplication::globalStrut().height() );
754 754
 }
755 755
 
756 756
 int KonqComboListBoxPixmap::width( const TQListBox* lb ) const
757 757
 {
758 758
     if ( text().isEmpty() )
759
-        return QMAX( pm.width() + 6, TQApplication::globalStrut().width() );
760
-    return QMAX( pm.width() + lb->fontMetrics().width( text() ) + 6,
759
+        return TQMAX( pm.width() + 6, TQApplication::globalStrut().width() );
760
+    return TQMAX( pm.width() + lb->fontMetrics().width( text() ) + 6,
761 761
                  TQApplication::globalStrut().width() );
762 762
 }
763 763
 

+ 21
- 21
konsole/konsole/TEScreen.cpp View File

@@ -141,8 +141,8 @@ void TEScreen::cursorUp(int n)
141 141
 {
142 142
   if (n == 0) n = 1; // Default
143 143
   int stop = cuY < tmargin ? 0 : tmargin;
144
-  cuX = QMIN(columns-1,cuX); // nowrap!
145
-  cuY = QMAX(stop,cuY-n);
144
+  cuX = TQMIN(columns-1,cuX); // nowrap!
145
+  cuY = TQMAX(stop,cuY-n);
146 146
 }
147 147
 
148 148
 /*!
@@ -156,8 +156,8 @@ void TEScreen::cursorDown(int n)
156 156
 {
157 157
   if (n == 0) n = 1; // Default
158 158
   int stop = cuY > bmargin ? lines-1 : bmargin;
159
-  cuX = QMIN(columns-1,cuX); // nowrap!
160
-  cuY = QMIN(stop,cuY+n);
159
+  cuX = TQMIN(columns-1,cuX); // nowrap!
160
+  cuY = TQMIN(stop,cuY+n);
161 161
 }
162 162
 
163 163
 /*!
@@ -170,8 +170,8 @@ void TEScreen::cursorLeft(int n)
170 170
 //=CUB
171 171
 {
172 172
   if (n == 0) n = 1; // Default
173
-  cuX = QMIN(columns-1,cuX); // nowrap!
174
-  cuX = QMAX(0,cuX-n);
173
+  cuX = TQMIN(columns-1,cuX); // nowrap!
174
+  cuX = TQMAX(0,cuX-n);
175 175
 }
176 176
 
177 177
 /*!
@@ -184,7 +184,7 @@ void TEScreen::cursorRight(int n)
184 184
 //=CUF
185 185
 {
186 186
   if (n == 0) n = 1; // Default
187
-  cuX = QMIN(columns-1,cuX+n);
187
+  cuX = TQMIN(columns-1,cuX+n);
188 188
 }
189 189
 
190 190
 /*!
@@ -268,7 +268,7 @@ void TEScreen::NextLine()
268 268
 void TEScreen::eraseChars(int n)
269 269
 {
270 270
   if (n == 0) n = 1; // Default
271
-  int p = QMAX(0,QMIN(cuX+n-1,columns-1));
271
+  int p = TQMAX(0,TQMIN(cuX+n-1,columns-1));
272 272
   clearImage(loc(cuX,cuY),loc(p,cuY),' ');
273 273
 }
274 274
 
@@ -281,7 +281,7 @@ void TEScreen::deleteChars(int n)
281 281
 {
282 282
   if (n == 0) n = 1; // Default
283 283
   if (n > columns) n = columns - 1;
284
-  int p = QMAX(0,QMIN(cuX+n,columns-1));
284
+  int p = TQMAX(0,TQMIN(cuX+n,columns-1));
285 285
   moveImage(loc(cuX,cuY),loc(p,cuY),loc(columns-1,cuY));
286 286
   clearImage(loc(columns-n,cuY),loc(columns-1,cuY),' ');
287 287
 }
@@ -294,8 +294,8 @@ void TEScreen::deleteChars(int n)
294 294
 void TEScreen::insertChars(int n)
295 295
 {
296 296
   if (n == 0) n = 1; // Default
297
-  int p = QMAX(0,QMIN(columns-1-n,columns-1));
298
-  int q = QMAX(0,QMIN(cuX+n,columns-1));
297
+  int p = TQMAX(0,TQMIN(columns-1-n,columns-1));
298
+  int q = TQMAX(0,TQMIN(cuX+n,columns-1));
299 299
   moveImage(loc(q,cuY),loc(cuX,cuY),loc(p,cuY));
300 300
   clearImage(loc(cuX,cuY),loc(q-1,cuY),' ');
301 301
 }
@@ -382,8 +382,8 @@ void TEScreen::saveCursor()
382 382
 
383 383
 void TEScreen::restoreCursor()
384 384
 {
385
-  cuX     = QMIN(sa_cuX,columns-1);
386
-  cuY     = QMIN(sa_cuY,lines-1);
385
+  cuX     = TQMIN(sa_cuX,columns-1);
386
+  cuY     = TQMIN(sa_cuY,lines-1);
387 387
   cu_re   = sa_cu_re;
388 388
   cu_fg   = sa_cu_fg;
389 389
   cu_bg   = sa_cu_bg;
@@ -436,8 +436,8 @@ void TEScreen::resizeImage(int new_lines, int new_columns)
436 436
     }
437 437
     newwrapped[y]=false;
438 438
   }
439
-  int cpy_lines   = QMIN(new_lines,  lines);
440
-  int cpy_columns = QMIN(new_columns,columns);
439
+  int cpy_lines   = TQMIN(new_lines,  lines);
440
+  int cpy_columns = TQMIN(new_columns,columns);
441 441
   // copy to new image
442 442
   for (int y = 0; y < cpy_lines; y++) {
443 443
     for (int x = 0; x < cpy_columns; x++)
@@ -454,8 +454,8 @@ void TEScreen::resizeImage(int new_lines, int new_columns)
454 454
   line_wrapped = newwrapped;
455 455
   lines = new_lines;
456 456
   columns = new_columns;
457
-  cuX = QMIN(cuX,columns-1);
458
-  cuY = QMIN(cuY,lines-1);
457
+  cuX = TQMIN(cuX,columns-1);
458
+  cuY = TQMIN(cuY,lines-1);
459 459
 
460 460
   // FIXME: try to keep values, evtl.
461 461
   tmargin=0;
@@ -546,7 +546,7 @@ ca* TEScreen::getCookedImage()
546 546
 //  kdDebug(1211) << "InGetCookedImage" << endl;
547 547
   for (y = 0; (y < lines) && (y < (hist->getLines()-histCursor)); y++)
548 548
   {
549
-    int len = QMIN(columns,hist->getLineLen(y+histCursor));
549
+    int len = TQMIN(columns,hist->getLineLen(y+histCursor));
550 550
     int yp  = y*columns;
551 551
 
552 552
 //    kdDebug(1211) << "InGetCookedImage - In first For.  Y =" << y << "histCursor = " << histCursor << endl;
@@ -648,7 +648,7 @@ void TEScreen::clear()
648 648
 
649 649
 void TEScreen::BackSpace()
650 650
 {
651
-  cuX = QMAX(0,cuX-1);
651
+  cuX = TQMAX(0,cuX-1);
652 652
   if (BS_CLEARS) image[loc(cuX,cuY)].c = ' ';
653 653
 }
654 654
 
@@ -841,7 +841,7 @@ void TEScreen::setCursorX(int x)
841 841
 {
842 842
   if (x == 0) x = 1; // Default
843 843
   x -= 1; // Adjust
844
-  cuX = QMAX(0,QMIN(columns-1, x));
844
+  cuX = TQMAX(0,TQMIN(columns-1, x));
845 845
 }
846 846
 
847 847
 /*! Set the cursor to y-th line. */
@@ -850,7 +850,7 @@ void TEScreen::setCursorY(int y)
850 850
 {
851 851
   if (y == 0) y = 1; // Default
852 852
   y -= 1; // Adjust
853
-  cuY = QMAX(0,QMIN(lines  -1, y + (getMode(MODE_Origin) ? tmargin : 0) ));
853
+  cuY = TQMAX(0,TQMIN(lines  -1, y + (getMode(MODE_Origin) ? tmargin : 0) ));
854 854
 }
855 855
 
856 856
 /*! set cursor to the `left upper' corner of the screen (1,1).

+ 6
- 6
konsole/konsole/TEWidget.cpp View File

@@ -642,10 +642,10 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
642 642
           TQ_UINT8 dalpha = 255 - salpha;
643 643
 
644 644
           int a, r, g, b;
645
-          a = QMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 );
646
-          r = QMIN( (tqRed   (col) * salpha) / 255 + (tqRed   (blend_color) * dalpha) / 255, 255 );
647
-          g = QMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 );
648
-          b = QMIN( (tqBlue  (col) * salpha) / 255 + (tqBlue  (blend_color) * dalpha) / 255, 255 );
645
+          a = TQMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 );
646
+          r = TQMIN( (tqRed   (col) * salpha) / 255 + (tqRed   (blend_color) * dalpha) / 255, 255 );
647
+          g = TQMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 );
648
+          b = TQMIN( (tqBlue  (col) * salpha) / 255 + (tqBlue  (blend_color) * dalpha) / 255, 255 );
649 649
 
650 650
           col = a << 24 | r << 16 | g << 8 | b;
651 651
           int pixel = a << 24 | (r * a / 255) << 16 | (g * a / 255) << 8 | (b * a / 255);
@@ -1211,8 +1211,8 @@ void TEWidget::updateImageSize()
1211 1211
   int oldcol = columns;
1212 1212
   makeImage();
1213 1213
   // we copy the old image to reduce flicker
1214
-  int lins = QMIN(oldlin,lines);
1215
-  int cols = QMIN(oldcol,columns);
1214
+  int lins = TQMIN(oldlin,lines);
1215
+  int cols = TQMIN(oldcol,columns);
1216 1216
   if (oldimg)
1217 1217
   {
1218 1218
     for (int lin = 0; lin < lins; lin++)

+ 2
- 2
konsole/konsole/TEmuVt102.cpp View File

@@ -242,14 +242,14 @@ void TEmuVt102::addDigit(int dig)
242 242
 
243 243
 void TEmuVt102::addArgument()
244 244
 {
245
-  argc = QMIN(argc+1,MAXARGS-1);
245
+  argc = TQMIN(argc+1,MAXARGS-1);
246 246
   argv[argc] = 0;
247 247
 }
248 248
 
249 249
 void TEmuVt102::pushToToken(int cc)
250 250
 {
251 251
   pbuf[ppos] = cc;
252
-  ppos = QMIN(ppos+1,MAXPBUF-1);
252
+  ppos = TQMIN(ppos+1,MAXPBUF-1);
253 253
 }
254 254
 
255 255
 // Character Classes used while decoding

+ 2
- 2
konsole/konsole/session.cpp View File

@@ -283,8 +283,8 @@ void TESession::notifySessionState(int state)
283 283
 void TESession::onContentSizeChange(int height, int width)
284 284
 {
285 285
   // ensure that image is at least one line high by one column wide
286
-  const int columns = QMAX( width/font_w , 1 );
287
-  const int lines = QMAX( height/font_h , 1 );
286
+  const int columns = TQMAX( width/font_w , 1 );
287
+  const int lines = TQMAX( height/font_h , 1 );
288 288
 
289 289
   em->onImageSizeChange( lines , columns );
290 290
   sh->setSize( lines , columns );

+ 1
- 1
ksplashml/main.cpp View File

@@ -64,7 +64,7 @@ int main( int argc, char **argv )
64 64
   KSplash wndMain("ksplash");
65 65
   if ( arg->isSet( "steps" ) )
66 66
   {
67
-    int steps = QMAX( arg->getOption( "steps" ).toInt(), 0 );
67
+    int steps = TQMAX( arg->getOption( "steps" ).toInt(), 0 );
68 68
     if ( steps )
69 69
       wndMain.setStartupItemCount( steps );
70 70
   }

+ 1
- 1
ksplashml/themeengine/default/themelegacy.cpp View File

@@ -163,7 +163,7 @@ void ThemeDefault::_initUi()
163 163
       mProgressBar->setBackgroundOrigin( TQWidget::ParentOrigin );
164 164
       mProgressBar->setPaletteBackgroundPixmap( blimage );
165 165
 
166
-      bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) );
166
+      bottom_label->setFixedWidth( TQMAX(blimage.width(),tlimage.width()) );
167 167
       bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 );
168 168
 
169 169
       // 3 pixels of whitespace between the label and the progressbar.

+ 8
- 8
ksplashml/themeengine/standard/wndicon.cpp View File

@@ -122,7 +122,7 @@ TQPoint WndIcon::determinePosition()
122 122
     nSlot = ( DW / wid );
123 123
     while( x > nSlot )
124 124
     {
125
-      x = QMAX(0,x-nSlot);
125
+      x = TQMAX(0,x-nSlot);
126 126
       y++;
127 127
     }
128 128
     X = (3) + ((x - 1) * wid);
@@ -134,7 +134,7 @@ TQPoint WndIcon::determinePosition()
134 134
     nSlot = ( DW / wid );
135 135
     while( x > nSlot )
136 136
     {
137
-      x = QMAX(0,x-nSlot);
137
+      x = TQMAX(0,x-nSlot);
138 138
       y++;
139 139
     }
140 140
     X = (3) + ((x - 1) * wid);
@@ -146,7 +146,7 @@ TQPoint WndIcon::determinePosition()
146 146
     nSlot = ( DW / wid );
147 147
     while( x > nSlot )
148 148
     {
149
-      x = QMAX(0,x-nSlot);
149
+      x = TQMAX(0,x-nSlot);
150 150
       y++;
151 151
     }
152 152
     X = (DW - 3) - (( x ) * wid );
@@ -158,7 +158,7 @@ TQPoint WndIcon::determinePosition()
158 158
     nSlot = ( DW / wid );
159 159
     while( x > nSlot )
160 160
     {
161
-      x = QMAX(0,x-nSlot);
161
+      x = TQMAX(0,x-nSlot);
162 162
       y++;
163 163
     }
164 164
     X = (DW - 3) - (( x ) * wid );
@@ -170,7 +170,7 @@ TQPoint WndIcon::determinePosition()
170 170
     nSlot = ( DH / wid );
171 171
     while( x > nSlot )
172 172
     {
173
-      x = QMAX(0,x-nSlot);
173
+      x = TQMAX(0,x-nSlot);
174 174
       y++;
175 175
     }
176 176
     X = (3) + (( y - 1 ) * wid );
@@ -182,7 +182,7 @@ TQPoint WndIcon::determinePosition()
182 182
     nSlot = ( DH / wid );
183 183
     while( x > nSlot )
184 184
     {
185
-      x = QMAX(0,x-nSlot);
185
+      x = TQMAX(0,x-nSlot);
186 186
       y++;
187 187
     }
188 188
     X = (DW - 3) - (( y ) * wid );
@@ -194,7 +194,7 @@ TQPoint WndIcon::determinePosition()
194 194
     nSlot = ( DH / wid );
195 195
     while( x > nSlot )
196 196
     {
197
-      x = QMAX(0,x-nSlot);
197
+      x = TQMAX(0,x-nSlot);
198 198
       y++;
199 199
     }
200 200
     X = (3) + (( y - 1 ) * wid );
@@ -206,7 +206,7 @@ TQPoint WndIcon::determinePosition()
206 206
     nSlot = ( DH / wid );
207 207
     while( x > nSlot )
208 208
     {
209
-      x = QMAX(0,x-nSlot);
209
+      x = TQMAX(0,x-nSlot);
210 210
       y++;
211 211
     }
212 212
     X = (DW - 3) - (( y ) * wid );

+ 1
- 1
ksplashml/themeengine/standard/wndstatus.cpp View File

@@ -72,7 +72,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
72 72
   TQWidget *widg = new TQWidget( this );
73 73
   setStretchFactor(widg,50);
74 74
 
75
-  setFixedSize( rect.width(), QMAX(m_progress->height(),m_label->height()) );
75
+  setFixedSize( rect.width(), TQMAX(m_progress->height(),m_label->height()) );
76 76
 
77 77
   if ( atTop )
78 78
     move( rect.topLeft() );

+ 13
- 13
libkonq/konq_iconviewwidget.cc View File

@@ -639,7 +639,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie
639 639
         int realSize = size ? size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
640 640
         // choose spacing depending on font, but min 5 (due to KFileIVI  move limit)
641 641
         setSpacing( ( m_bDesktop || ( realSize > TDEIcon::SizeSmall ) ) ?
642
-                    QMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
642
+                    TQMAX( 5, TQFontMetrics(font()).width('n') ) : 0 );
643 643
     }
644 644
 
645 645
     if ( sizeChanged || previewSizeChanged || !stopImagePreviewFor.isEmpty() )
@@ -711,10 +711,10 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos )
711 711
 
712 712
     if ( m_bSetGridX )
713 713
         if ( pos == TQIconView::Bottom )
714
-            setGridX( QMAX( sz + 50, previewIconSize( sz ) + 13 ) );
714
+            setGridX( TQMAX( sz + 50, previewIconSize( sz ) + 13 ) );
715 715
         else
716 716
         {
717
-            setMaxItemWidth( QMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth() );
717
+            setMaxItemWidth( TQMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth() );
718 718
             setGridX( -1 );
719 719
         }
720 720
 
@@ -734,9 +734,9 @@ void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy,
734 734
     // vertical  : top spacing(), <height>, bottom spacing()
735 735
     // The doubled space in y-direction gives a better visual separation and makes it clearer
736 736
     // to which item the text belongs
737
-    *dx = spacing() + QMAX( QMAX( iconSize, previewSize ), m_pSettings->iconTextWidth() );
737
+    *dx = spacing() + TQMAX( TQMAX( iconSize, previewSize ), m_pSettings->iconTextWidth() );
738 738
     int textHeight = iconTextHeight() * fontMetrics().height();
739
-    *dy = spacing() + QMAX( iconSize, previewSize ) + 2 + textHeight + spacing();
739
+    *dy = spacing() + TQMAX( iconSize, previewSize ) + 2 + textHeight + spacing();
740 740
 
741 741
     // Icon Area
742 742
     int w, h;
@@ -790,9 +790,9 @@ int KonqIconViewWidget::gridXValue() const
790 790
     int newGridX;
791 791
 
792 792
     if ( itemTextPos() == TQIconView::Bottom )
793
-        newGridX = QMAX( sz + 50, previewIconSize( sz ) + 13 );
793
+        newGridX = TQMAX( sz + 50, previewIconSize( sz ) + 13 );
794 794
     else
795
-        newGridX = QMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth();
795
+        newGridX = TQMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth();
796 796
 
797 797
     //kdDebug(1203) << "gridXValue: " << newGridX << " sz=" << sz << endl;
798 798
     return newGridX;
@@ -1488,7 +1488,7 @@ void KonqIconViewWidget::insertInGrid(TQIconViewItem *item)
1488 1488
     for (; i; i = i->nextItem() )
1489 1489
     {
1490 1490
         r = r.subtract(i->rect());
1491
-        y = QMAX(y, i->y() + i->height());
1491
+        y = TQMAX(y, i->y() + i->height());
1492 1492
     }
1493 1493
 
1494 1494
     TQMemArray<TQRect> rects = r.rects();
@@ -1586,8 +1586,8 @@ void KonqIconViewWidget::lineupIcons()
1586 1586
         int x = item->x() + item->width() / 2 - x0;
1587 1587
         int y = item->pixmapRect( false ).bottom() - iconSize / 2
1588 1588
                 - ( dy - ( iconSize + textHeight ) ) / 2 - y0;
1589
-        int posX = QMIN( nx-1, QMAX( 0, x / dx ) );
1590
-        int posY = QMIN( ny-1, QMAX( 0, y / dy ) );
1589
+        int posX = TQMIN( nx-1, TQMAX( 0, x / dx ) );
1590
+        int posY = TQMIN( ny-1, TQMAX( 0, y / dy ) );
1591 1591
 
1592 1592
         if ( !bins[posX][posY] )
1593 1593
             bins[posX][posY] = new Bin;
@@ -1646,7 +1646,7 @@ void KonqIconViewWidget::lineupIcons()
1646 1646
                 TQIconViewItem* movedItem;
1647 1647
                 Bin* items = bins[i][j];
1648 1648
 
1649
-                int mini = QMIN( QMIN( tf, bf ), QMIN( lf, rf ) );
1649
+                int mini = TQMIN( TQMIN( tf, bf ), TQMIN( lf, rf ) );
1650 1650
                 if ( tf == mini ) {
1651 1651
                     // move top item in (i,j) to (i,j-1)
1652 1652
                     Bin::iterator it = items->begin();
@@ -1717,7 +1717,7 @@ void KonqIconViewWidget::lineupIcons()
1717 1717
             if ( !bin->isEmpty() ) {
1718 1718
                 TQIconViewItem* item = bin->first();
1719 1719
                 int newX = x0 + i*dx + spacing() +
1720
-                           QMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // pixmap can be larger as iconsize
1720
+                           TQMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // pixmap can be larger as iconsize
1721 1721
                 // align all icons vertically to their text
1722 1722
                 int newY = y0 + j*dy + dy - spacing() - ( item->pixmapRect().bottom() + 2 + textHeight );
1723 1723
                 if ( item->x() != newX || item->y() != newY ) {
@@ -1770,7 +1770,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement )
1770 1770
     TQIconViewItem* item;
1771 1771
     for ( item = firstItem(); item; item = item->nextItem() ) {
1772 1772
         int newX = x0 + nx*dx + spacing() +
1773
-                   QMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // icon can be larger as defined
1773
+                   TQMAX(0, ( (dx-spacing()) - item->width() ) / 2);  // icon can be larger as defined
1774 1774
         // align all icons vertically to their text
1775 1775
         int newY = y0 + ny*dy + dy - spacing() - ( item->pixmapRect().bottom() + 2 + textHeight );
1776 1776
         if ( item->x() != newX || item->y() != newY ) {

+ 1
- 1
nsplugins/viewer/kxt.cpp View File

@@ -281,7 +281,7 @@ static void np_do_timers( void*, void* )
281 281
     timeval *tm = qt_wait_timer();
282 282
 
283 283
     if (tm) {
284
-        int interval = QMIN(tm->tv_sec,INT_MAX/1000)*1000 + tm->tv_usec/1000;
284
+        int interval = TQMIN(tm->tv_sec,INT_MAX/1000)*1000 + tm->tv_usec/1000;
285 285
         np_set_timer( interval );
286 286
     }
287 287
     qxtapp->sendPostedEvents();

+ 1
- 1
nsplugins/viewer/nsplugin.cpp View File

@@ -1700,7 +1700,7 @@ int NSPluginStreamBase::process( const TQByteArray &data, int start )
1700 1700
 
1701 1701
       max = _instance->NPWriteReady(_stream);
1702 1702
       //kdDebug(1431) << "to_sent == " << to_sent << " and max = " << max << endl;
1703
-      len = QMIN(max, to_sent);
1703
+      len = TQMIN(max, to_sent);
1704 1704
 
1705 1705
       //kdDebug(1431) << "-> Feeding stream to plugin: offset=" << _pos << ", len=" << len << endl;
1706 1706
       sent = _instance->NPWrite( _stream, _pos, len, d );

+ 5
- 5
tdeioslave/pop3/pop3.cc View File

@@ -230,7 +230,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
230 230
   if (strncmp(buf, "+OK", 3) == 0) {
231 231
     if (r_buf && r_len) {
232 232
       memcpy(r_buf, (buf[3] == ' ' ? buf + 4 : buf + 3),
233
-             QMIN(r_len, (buf[3] == ' ' ? recv_len - 4 : recv_len - 3)));
233
+             TQMIN(r_len, (buf[3] == ' ' ? recv_len - 4 : recv_len - 3)));
234 234
     }
235 235
 
236 236
     delete[]buf;
@@ -239,7 +239,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
239 239
   } else if (strncmp(buf, "-ERR", 4) == 0) {
240 240
     if (r_buf && r_len) {
241 241
       memcpy(r_buf, (buf[4] == ' ' ? buf + 5 : buf + 4),
242
-             QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
242
+             TQMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
243 243
     }
244 244
 
245 245
     TQString command = TQString::fromLatin1(cmd);
@@ -256,8 +256,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
256 256
     return Err;
257 257
   } else if (strncmp(buf, "+ ", 2) == 0) {
258 258
     if (r_buf && r_len) {
259
-      memcpy(r_buf, buf + 2, QMIN(r_len, recv_len - 4));
260
-      r_buf[QMIN(r_len - 1, recv_len - 4)] = '\0';
259
+      memcpy(r_buf, buf + 2, TQMIN(r_len, recv_len - 4));
260
+      r_buf[TQMIN(r_len - 1, recv_len - 4)] = '\0';
261 261
     }
262 262
 
263 263
     delete[]buf;
@@ -267,7 +267,7 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
267 267
     POP3_DEBUG << "Invalid POP3 response received!" << endl;
268 268
 
269 269
     if (r_buf && r_len) {
270
-      memcpy(r_buf, buf, QMIN(r_len, recv_len));
270
+      memcpy(r_buf, buf, TQMIN(r_len, recv_len));
271 271
     }
272 272
 
273 273
     if (!buf || !*buf) {

+ 2
- 2
tdeioslave/thumbnail/textcreator.cpp View File

@@ -122,9 +122,9 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i
122 122
             TQRect rect;
123 123
 
124 124
             int rest = m_pixmap.width() - (numCharsPerLine * chSize.width());
125
-            xborder = QMAX( xborder, rest/2); // center horizontally
125
+            xborder = TQMAX( xborder, rest/2); // center horizontally
126 126
             rest = m_pixmap.height() - (numLines * chSize.height());
127
-            yborder = QMAX( yborder, rest/2); // center vertically
127
+            yborder = TQMAX( yborder, rest/2); // center vertically
128 128
             // end centering
129 129
 
130 130
             int x = xborder, y = yborder; // where to paint the characters

+ 2
- 2
tdeioslave/thumbnail/thumbnail.cpp View File

@@ -348,9 +348,9 @@ void ThumbnailProtocol::get(const KURL &url)
348 348
         TQImage icon = getIcon();
349 349
 
350 350
         int x = img.width() - icon.width() - 4;
351
-        x = QMAX( x, 0 );
351
+        x = TQMAX( x, 0 );
352 352
         int y = img.height() - icon.height() - 6;
353
-        y = QMAX( y, 0 );
353
+        y = TQMAX( y, 0 );
354 354
         KImageEffect::blendOnLower( x, y, icon, img );
355 355
     }
356 356
 

+ 2
- 2
tdesu/tdesud/repo.cpp View File

@@ -34,7 +34,7 @@ void Repository::add(const TQCString &key, Data_entry &data)
34 34
         data.timeout = (unsigned) -1;
35 35
     else
36 36
         data.timeout += time(0L);
37
-    head_time = QMIN(head_time, data.timeout);
37
+    head_time = TQMIN(head_time, data.timeout);
38 38
     repo.insert(key, data);
39 39
 }
40 40
 
@@ -177,7 +177,7 @@ int Repository::expire()
177 177
 	if (t <= current)
178 178
 	    keys.push(it.key());
179 179
 	else
180
-	    head_time = QMIN(head_time, t);
180
+	    head_time = TQMIN(head_time, t);
181 181
     }
182 182
 
183 183
     int n = keys.count();

+ 2
- 2
tdesu/tdesud/tdesud.cpp View File

@@ -294,14 +294,14 @@ int main(int argc, char *argv[])
294 294
 
295 295
     // Make sure we exit when the display gets closed.
296 296
     int x11Fd = initXconnection();
297
-    maxfd = QMAX(maxfd, x11Fd);
297
+    maxfd = TQMAX(maxfd, x11Fd);
298 298
 
299 299
     repo = new Repository;
300 300
     TQPtrVector<ConnectionHandler> handler;
301 301
     handler.setAutoDelete(true);
302 302
 
303 303
     pipe(pipeOfDeath);
304
-    maxfd = QMAX(maxfd, pipeOfDeath[0]);
304
+    maxfd = TQMAX(maxfd, pipeOfDeath[0]);
305 305
 
306 306
     // Signal handlers 
307 307
     struct sigaction sa;

+ 1
- 1
tdm/kfrontend/kgverify.cpp View File

@@ -230,7 +230,7 @@ KGVerify::scheduleAutoLogin( bool initial )
230 230
 			timedLeft = _autoLoginDelay;
231 231
 			deadTicks = 0;
232 232
 		} else {
233
-			timedLeft = QMAX( _autoLoginDelay - TIMED_GREET_TO, MIN_TIMED_TO );
233
+			timedLeft = TQMAX( _autoLoginDelay - TIMED_GREET_TO, MIN_TIMED_TO );
234 234
 			deadTicks = DEAD_TIMED_TO;
235 235
 		}
236 236
 		updateStatus();

+ 2
- 2
tdm/kfrontend/tdmclock.cpp View File

@@ -115,7 +115,7 @@ void KdmClock::paintEvent( TQPaintEvent * )
115 115
 			             time.second() );
116 116
 		else
117 117
 			buf.sprintf( "%02d:%02d", time.hour(), time.minute() );
118
-		mFont.setPointSize( QMIN( (int)(width()/buf.length()*1.5),height() ) );
118
+		mFont.setPointSize( TQMIN( (int)(width()/buf.length()*1.5),height() ) );
119 119
 		paint.setFont( mFont );
120 120
 		paint.setPen( backgroundColor() );
121 121
 		paint.drawText( contentsRect(),AlignHCenter|AlignVCenter, buf,-1,0,0 );
@@ -123,7 +123,7 @@ void KdmClock::paintEvent( TQPaintEvent * )
123 123
 */
124 124
 		TQPointArray pts;
125 125
 		TQPoint cp = contentsRect().center() - TQPoint( 2,2 );
126
-		int d = QMIN( contentsRect().width()-15,contentsRect().height()-15 );
126
+		int d = TQMIN( contentsRect().width()-15,contentsRect().height()-15 );
127 127
 		paint.setPen( foregroundColor() );
128 128
 		paint.setBrush( foregroundColor() );
129 129
 

+ 1
- 1
tdm/kfrontend/themer/tdmitem.cpp View File

@@ -362,7 +362,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
362 362
 
363 363
 	if (area.intersects( rect )) {
364 364
 		TQRect contentsRect = area.intersect( rect );
365
-		contentsRect.moveBy( QMIN( 0, -area.x() ), QMIN( 0, -area.y() ) );
365
+		contentsRect.moveBy( TQMIN( 0, -area.x() ), TQMIN( 0, -area.y() ) );
366 366
 		drawContents( p, contentsRect );
367 367
 	}
368 368
 

+ 2
- 2
twin/client.cpp View File

@@ -889,7 +889,7 @@ void Client::setShade( ShadeMode mode )
889 889
 // FRAME       repaint( FALSE );
890 890
 //        bool wasStaticContents = testWFlags( WStaticContents );
891 891
 //        setWFlags( WStaticContents );
892
-        int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
892
+        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
893 893
         do 
894 894
             {
895 895
             h -= step;
@@ -919,7 +919,7 @@ void Client::setShade( ShadeMode mode )
919 919
         TQSize s( sizeForClientSize( clientSize()));
920 920
 // FRAME       bool wasStaticContents = testWFlags( WStaticContents );
921 921
 //        setWFlags( WStaticContents );
922
-        int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
922
+        int step = TQMAX( 4, QABS( h - s.height() ) / as )+1;
923 923
         do 
924 924
             {
925 925
             h += step;

+ 10
- 10
twin/clients/keramik/keramik.cpp View File

@@ -1279,7 +1279,7 @@ void KeramikClient::updateCaptionBuffer()
1279 1279
 	int tw = p.fontMetrics().width( caption() ) +
1280 1280
 		( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 );
1281 1281
 
1282
-	int xpos = QMAX( (captionRect.width() - tw) / 3, 8 );
1282
+	int xpos = TQMAX( (captionRect.width() - tw) / 3, 8 );
1283 1283
 	TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10,
1284 1284
 				captionRect.height() - 4), captionBuffer.rect() );
1285 1285
 
@@ -1348,7 +1348,7 @@ void KeramikClient::calculateCaptionRect()
1348 1348
 	if ( clientHandler->showAppIcons() )
1349 1349
 		cw += 16 + 4; // icon width + space
1350 1350
 
1351
-	cw = QMIN( cw, titlebar->geometry().width() );
1351
+	cw = TQMIN( cw, titlebar->geometry().width() );
1352 1352
 	captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY),
1353 1353
 				cw, clientHandler->titleBarHeight(largeCaption) ),
1354 1354
 				titlebar->geometry() );
@@ -1554,8 +1554,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
1554 1554
 
1555 1555
 		// Space between the top left corner and the caption bubble
1556 1556
 		if ( updateRect.x() < captionRect.left() && updateRect.right() >= 15 ) {
1557
-			int x1 = QMAX( 15, updateRect.x() );
1558
-			int x2 = QMIN( captionRect.left(), updateRect.right() );
1557
+			int x1 = TQMAX( 15, updateRect.x() );
1558
+			int x2 = TQMIN( captionRect.left(), updateRect.right() );
1559 1559
 
1560 1560
 			p.drawTiledPixmap( x1, titleBaseY, x2 - x1 + 1, titleBarBaseHeight,
1561 1561
 					*clientHandler->tile( TitleCenter, active ) );
@@ -1572,8 +1572,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
1572 1572
 
1573 1573
 		// Space between the caption bubble and the top right corner
1574 1574
 		if ( updateRect.right() > captionRect.right() && updateRect.x() < width() - 15 ) { // FRAME
1575
-			int x1 = QMAX( captionRect.right() + 1, updateRect.x() );
1576
-			int x2 = QMIN( width() - 15, updateRect.right() );
1575
+			int x1 = TQMAX( captionRect.right() + 1, updateRect.x() );
1576
+			int x2 = TQMIN( width() - 15, updateRect.right() );
1577 1577
 
1578 1578
 			p.drawTiledPixmap( x1, titleBaseY, x2 - x1 + 1, titleBarBaseHeight,
1579 1579
 					*clientHandler->tile( TitleCenter, active ) );
@@ -1590,8 +1590,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
1590 1590
 	if ( updateRect.bottom() >= titleBarHeight &&
1591 1591
 			updateRect.top() < height() - grabBarHeight )
1592 1592
 	{
1593
-		int top    = QMAX( titleBarHeight, updateRect.top() );
1594
-		int bottom = QMIN( updateRect.bottom(), height() - grabBarHeight );
1593
+		int top    = TQMAX( titleBarHeight, updateRect.top() );
1594
+		int bottom = TQMIN( updateRect.bottom(), height() - grabBarHeight );
1595 1595
 
1596 1596
 		// Left border
1597 1597
 		if ( updateRect.x() < leftBorderWidth )
@@ -1614,8 +1614,8 @@ void KeramikClient::paintEvent( TQPaintEvent *e )
1614 1614
 
1615 1615
 		// Space between the left corner and the right corner
1616 1616
 		if ( updateRect.x() < width() - 9 ) {
1617
-			int x1 = QMAX( 9, updateRect.x() );
1618
-			int x2 = QMIN( width() - 9, updateRect.right() );
1617
+			int x1 = TQMAX( 9, updateRect.x() );
1618
+			int x2 = TQMIN( width() - 9, updateRect.right() );
1619 1619
 
1620 1620
 			p.drawTiledPixmap( x1, height() - grabBarHeight, x2 - x1 + 1,
1621 1621
 					grabBarHeight, *clientHandler->tile( GrabBarCenter, active ) );

+ 3
- 3
twin/clients/plastik/plastik.cpp View File

@@ -171,7 +171,7 @@ void PlastikHandler::readConfig()
171 171
     TQFontMetrics fm(m_titleFont);  // active font = inactive font
172 172
     int titleHeightMin = config.readNumEntry("MinTitleHeight", 16);
173 173
     // The title should strech with bigger font sizes!
174
-    m_titleHeight = QMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc.
174
+    m_titleHeight = TQMAX(titleHeightMin, fm.height() + 4); // 4 px for the shadow etc.
175 175
     // have an even title/button size so the button icons are fully centered...
176 176
     if ( m_titleHeight%2 == 0)
177 177
         m_titleHeight++;
@@ -179,7 +179,7 @@ void PlastikHandler::readConfig()
179 179
     fm = TQFontMetrics(m_titleFontTool);  // active font = inactive font
180 180
     int titleHeightToolMin = config.readNumEntry("MinTitleHeightTool", 13);
181 181
     // The title should strech with bigger font sizes!
182
-    m_titleHeightTool = QMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc.
182
+    m_titleHeightTool = TQMAX(titleHeightToolMin, fm.height() ); // don't care about the shadow etc.
183 183
     // have an even title/button size so the button icons are fully centered...
184 184
     if ( m_titleHeightTool%2 == 0)
185 185
         m_titleHeightTool++;
@@ -560,7 +560,7 @@ const TQBitmap &PlastikHandler::buttonBitmap(ButtonIcon type, const TQSize &size
560 560
     delete m_bitmaps[toolWindow][typeIndex];
561 561
     m_bitmaps[toolWindow][typeIndex] = 0;
562 562
 
563
-    TQBitmap bmp = IconEngine::icon(type /*icon*/, QMIN(w,h) );
563
+    TQBitmap bmp = IconEngine::icon(type /*icon*/, TQMIN(w,h) );
564 564
     TQBitmap *bitmap = new TQBitmap(bmp);
565 565
     m_bitmaps[toolWindow][typeIndex] = bitmap;
566 566
     return *bitmap;

+ 1
- 1
twin/clients/plastik/plastikbutton.cpp View File

@@ -531,7 +531,7 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size)
531 531
                 lw2 = 1;
532 532
             }
533 533
 
534
-            int h = QMAX( (r.width()/2), (lw1+2*lw2) );
534
+            int h = TQMAX( (r.width()/2), (lw1+2*lw2) );
535 535
 
536 536
             // horizontal bars
537 537
             drawObject(p, HorizontalLine, r.x(), r.y(), r.width(), lw1);

+ 2
- 2
twin/clients/web/Web.cpp View File

@@ -179,7 +179,7 @@ WebClient::init()
179 179
     default:
180 180
       borderSize_ = 4;
181 181
   }
182
-  titleHeight_ = QMAX(QMAX(14, fm.height() + textVMargin * 2), borderSize_);
182
+  titleHeight_ = TQMAX(TQMAX(14, fm.height() + textVMargin * 2), borderSize_);
183 183
   if (0 != titleHeight_ % 2)
184 184
     titleHeight_ += 1;
185 185
 
@@ -202,7 +202,7 @@ WebClient::reset( unsigned long changed )
202 202
     // title height
203 203
     const int textVMargin   = 2;
204 204
     TQFontMetrics fm(options()->font(isActive(), isToolWindow()));
205
-    titleHeight_ = QMAX(QMAX(14, fm.height() + textVMargin * 2), borderSize_);
205
+    titleHeight_ = TQMAX(TQMAX(14, fm.height() + textVMargin * 2), borderSize_);
206 206
     if (0 != titleHeight_ % 2)
207 207
       titleHeight_ += 1;
208 208
 

+ 10
- 10
twin/geometry.cpp View File

@@ -717,10 +717,10 @@ void Client::keepInArea( TQRect area, bool partial )
717 717
     if( partial )
718 718
         {
719 719
         // increase the area so that can have only 100 pixels in the area
720
-        area.setLeft( QMIN( area.left() - width() + 100, area.left()));
721
-        area.setTop( QMIN( area.top() - height() + 100, area.top()));
722
-        area.setRight( QMAX( area.right() + width() - 100, area.right()));
723
-        area.setBottom( QMAX( area.bottom() + height() - 100, area.bottom()));
720
+        area.setLeft( TQMIN( area.left() - width() + 100, area.left()));
721
+        area.setTop( TQMIN( area.top() - height() + 100, area.top()));
722
+        area.setRight( TQMAX( area.right() + width() - 100, area.right()));
723
+        area.setBottom( TQMAX( area.bottom() + height() - 100, area.bottom()));
724 724
         }
725 725
     if ( geometry().right() > area.right() && width() < area.width() )
726 726
         move( area.right() - width(), y() );
@@ -1131,10 +1131,10 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra
1131 1131
         if( decominsize.height() > min_size.height())
1132 1132
                 min_size.setHeight( decominsize.height());
1133 1133
         }
1134
-    w = QMIN( max_size.width(), w );
1135
-    h = QMIN( max_size.height(), h );
1136
-    w = QMAX( min_size.width(), w );
1137
-    h = QMAX( min_size.height(), h );
1134
+    w = TQMIN( max_size.width(), w );
1135
+    h = TQMIN( max_size.height(), h );
1136
+    w = TQMAX( min_size.width(), w );
1137
+    h = TQMAX( min_size.height(), h );
1138 1138
 
1139 1139
     int w1 = w;
1140 1140
     int h1 = h;
@@ -1307,8 +1307,8 @@ void Client::getWmNormalHints()
1307 1307
         xSizeHint.max_width = xSizeHint.max_height = INT_MAX;
1308 1308
     else
1309 1309
         {
1310
-        xSizeHint.max_width = QMAX( xSizeHint.max_width, 1 );
1311
-        xSizeHint.max_height = QMAX( xSizeHint.max_height, 1 );
1310
+        xSizeHint.max_width = TQMAX( xSizeHint.max_width, 1 );
1311
+        xSizeHint.max_height = TQMAX( xSizeHint.max_height, 1 );
1312 1312
         }
1313 1313
     if( xSizeHint.flags & PResizeInc )
1314 1314
         {

+ 1
- 1
twin/geometrytip.cpp View File

@@ -48,7 +48,7 @@ void GeometryTip::setGeometry( const TQRect& geom )
48 48
             }
49 49
         }
50 50
 
51
-    h = QMAX( h, 0 ); // in case of isShade() and PBaseSize
51
+    h = TQMAX( h, 0 ); // in case of isShade() and PBaseSize
52 52
     TQString pos;
53 53
     pos.sprintf( "%+d,%+d<br>(<b>%d&nbsp;x&nbsp;%d</b>)",
54 54
                      geom.x(), geom.y(), w, h );

+ 1
- 1
twin/kcmtwin/twinoptions/windows.cpp View File

@@ -192,7 +192,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par
192 192
     connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
193 193
     fLay->addWidget(clickRaiseOn);
194 194
 
195
-//     fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
195
+//     fLay->addColSpacing(0,TQMAX(autoRaiseOn->sizeHint().width(),
196 196
 //                                clickRaiseOn->sizeHint().width()) + 15);
197 197
 
198 198
     TQHBoxLayout* focusStealingLayout = new TQHBoxLayout(lay,KDialog::spacingHint());

+ 2
- 2
twin/lib/kcommondecoration.cpp View File

@@ -524,8 +524,8 @@ void KCommonDecoration::resize( const TQSize& s )
524 524
 
525 525
 TQSize KCommonDecoration::minimumSize() const
526 526
 {
527
-    const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
528
-            +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
527
+    const int minWidth = TQMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft))
528
+            +TQMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight))
529 529
             +layoutMetric(LM_TitleBorderLeft)+layoutMetric(LM_TitleBorderRight);
530 530
     return TQSize(minWidth,
531 531
                  layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)

+ 2
- 2
twin/placement.cpp View File

@@ -188,8 +188,8 @@ void Placement::placeSmart(Client* c, const TQRect& area, Policy /*next*/ )
188 188
                     if((cxl < xr) && (cxr > xl) &&
189 189
                        (cyt < yb) && (cyb > yt)) 
190 190
                         {
191
-                        xl = QMAX(cxl, xl); xr = QMIN(cxr, xr);
192
-                        yt = QMAX(cyt, yt); yb = QMIN(cyb, yb);
191
+                        xl = TQMAX(cxl, xl); xr = TQMIN(cxr, xr);
192
+                        yt = TQMAX(cyt, yt); yb = TQMIN(cyb, yb);
193 193
                         if((*l)->keepAbove())
194 194
                             overlap += 16 * (xr - xl) * (yb - yt);
195 195
                         else if((*l)->keepBelow() && !(*l)->isDock()) // ignore KeepBelow windows

+ 1
- 1
twin/rules.cpp View File

@@ -113,7 +113,7 @@ Rules::Rules( TDEConfig& cfg )
113 113
     readFromCfg( cfg );
114 114
     }
115 115
 
116
-static int limit0to4( int i ) { return QMAX( 0, QMIN( 4, i )); }
116
+static int limit0to4( int i ) { return TQMAX( 0, TQMIN( 4, i )); }
117 117
 
118 118
 void Rules::readFromCfg( TDEConfig& cfg )
119 119
     {

+ 4
- 4
twin/tabbox.cpp View File

@@ -183,7 +183,7 @@ void TabBox::reset()
183 183
 
184 184
     // calculate height of 1 line
185 185
     // fontheight + 1 pixel above + 1 pixel below, or 32x32 icon + 2 pixel above + below
186
-    lineHeight = QMAX(fontMetrics().height() + 2, 32 + 4);
186
+    lineHeight = TQMAX(fontMetrics().height() + 2, 32 + 4);
187 187
 
188 188
     if ( mode() == WindowsMode )
189 189
         {
@@ -218,7 +218,7 @@ void TabBox::reset()
218 218
             {
219 219
             showMiniIcon = true;
220 220
             // fontheight + 1 pixel above + 1 pixel below, or 16x16 icon + 1 pixel above + below
221
-            lineHeight = QMAX(fontMetrics().height() + 2, 16 + 2);
221
+            lineHeight = TQMAX(fontMetrics().height() + 2, 16 + 2);
222 222
 
223 223
             h = clients.count() * lineHeight;
224 224
 
@@ -496,11 +496,11 @@ void TabBox::drawContents( TQPainter * )
496 496
         int wmax = 0;
497 497
         for ( int i = 1; i <= workspace()->numberOfDesktops(); i++ )
498 498
             {
499
-            wmax = QMAX(wmax, fontMetrics().width(workspace()->desktopName(i)));
499
+            wmax = TQMAX(wmax, fontMetrics().width(workspace()->desktopName(i)));
500 500
 
501 501
             // calculate max width of desktop-number text
502 502
             TQString num = TQString::number(i);
503
-            iconWidth = QMAX(iconWidth - 4, fm.boundingRect(num).width()) + 4;
503
+            iconWidth = TQMAX(iconWidth - 4, fm.boundingRect(num).width()) + 4;
504 504
             }
505 505
 
506 506
         // In DesktopMode, start at the current desktop

Loading…
Cancel
Save