summaryrefslogtreecommitdiffstats
path: root/tdeprint
diff options
context:
space:
mode:
Diffstat (limited to 'tdeprint')
-rw-r--r--tdeprint/droptionview.cpp4
-rw-r--r--tdeprint/kmjobmanager.cpp2
-rw-r--r--tdeprint/kmvirtualmanager.cpp4
-rw-r--r--tdeprint/kpmarginpage.cpp8
-rw-r--r--tdeprint/kprintdialog.cpp2
-rw-r--r--tdeprint/kprinter.cpp14
-rw-r--r--tdeprint/management/kmiconview.cpp4
-rw-r--r--tdeprint/management/kmtimer.cpp2
-rw-r--r--tdeprint/posterpreview.cpp8
-rw-r--r--tdeprint/tests/drawdemo.cpp2
-rw-r--r--tdeprint/treecombobox.cpp2
11 files changed, 26 insertions, 26 deletions
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index 77a910b0c..de20a62fa 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -94,7 +94,7 @@ void OptionNumericView::setOption(DrBase *opt)
int min_ = opt->get("minval").toInt();
int max_ = opt->get("maxval").toInt();
m_slider->setRange(min_,max_);
- m_slider->setSteps(1,QMAX((max_-min_)/20,1));
+ m_slider->setSteps(1,TQMAX((max_-min_)/20,1));
m_minval->setText(TQString::number(min_));
m_maxval->setText(TQString::number(max_));
}
@@ -104,7 +104,7 @@ void OptionNumericView::setOption(DrBase *opt)
int min_ = (int)rint(opt->get("minval").toFloat()*1000);
int max_ = (int)rint(opt->get("maxval").toFloat()*1000);
m_slider->setRange(min_,max_);
- m_slider->setSteps(1,QMAX((max_-min_)/20,1));
+ m_slider->setSteps(1,TQMAX((max_-min_)/20,1));
m_minval->setText(opt->get("minval"));
m_maxval->setText(opt->get("maxval"));
}
diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp
index de71d4dc7..9c655435d 100644
--- a/tdeprint/kmjobmanager.cpp
+++ b/tdeprint/kmjobmanager.cpp
@@ -229,7 +229,7 @@ void KMJobManager::removePrinter(const TQString& pr, KMJobManager::JobType type)
struct JobFilter *jf = m_filter.find(pr);
if (jf)
{
- jf->m_type[type] = QMAX(0, jf->m_type[type]-1);
+ jf->m_type[type] = TQMAX(0, jf->m_type[type]-1);
if (!jf->m_type[0] && !jf->m_type[1])
m_filter.remove(pr);
}
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index dabad3093..9262f3e3c 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -186,14 +186,14 @@ void KMVirtualManager::refresh()
if (getuid() == 0)
fi.setFile(fi2.absFilePath());
- if (!m_checktime.isValid() || m_checktime < QMAX(fi.lastModified(),fi2.lastModified()))
+ if (!m_checktime.isValid() || m_checktime < TQMAX(fi.lastModified(),fi2.lastModified()))
{
m_defaultprinter = TQString::null;
if (fi2.exists())
loadFile(fi2.absFilePath());
if (fi.exists() && fi.absFilePath() != fi2.absFilePath())
loadFile(fi.absFilePath());
- m_checktime = QMAX(fi.lastModified(),fi2.lastModified());
+ m_checktime = TQMAX(fi.lastModified(),fi2.lastModified());
}
else
{ // parse printers looking for instances -> undiscarded them, real printers
diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp
index 78b9ca6ef..019cf34d9 100644
--- a/tdeprint/kpmarginpage.cpp
+++ b/tdeprint/kpmarginpage.cpp
@@ -90,10 +90,10 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
{
w = dps->pageWidth();
h = dps->pageHeight();
- mt = QMAX( mt, dps->topMargin() );
- ml = QMAX( ml, dps->leftMargin() );
- mb = QMAX( mb, dps->bottomMargin() );
- mr = QMAX( mr, dps->rightMargin() );
+ mt = TQMAX( mt, dps->topMargin() );
+ ml = TQMAX( ml, dps->leftMargin() );
+ mb = TQMAX( mb, dps->bottomMargin() );
+ mr = TQMAX( mr, dps->rightMargin() );
}
}
}
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index d881971ff..afe775c57 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -580,7 +580,7 @@ void KPrintDialog::initialize(KPrinter *printer)
else if (defsearch == -1 && it.current()->name() == printer->searchName())
defsearch = d->m_printers->count()-1;
}
- int defindex = (defsearch != -1 ? defsearch : (defsoft != -1 ? defsoft : QMAX(defhard,0)));
+ int defindex = (defsearch != -1 ? defsearch : (defsoft != -1 ? defsoft : TQMAX(defhard,0)));
d->m_printers->setCurrentItem(defindex);
//slotPrinterSelected(defindex);
}
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 4b9a1c98f..010297e5a 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -334,14 +334,14 @@ void KPrinter::translateQtOptions()
{
// Printers can often print very close to the edges (PPD files say ImageArea==PaperDimension).
// But that doesn't mean it looks good. Apps which use setFullPage(false) assume that
- // KPrinter will give them reasonable margins, so let's QMAX with defaults from Qt in that case.
+ // KPrinter will give them reasonable margins, so let's TQMAX with defaults from Qt in that case.
// Keep this in sync with KPMarginPage::initPageSize
unsigned int it, il, ib, ir;
d->m_wrapper->margins( &it, &il, &ib, &ir );
- top = QMAX( top, (int)it );
- left = QMAX( left, (int)il );
- bottom = QMAX( bottom, (int)ib );
- right = QMAX( right, (int)ir );
+ top = TQMAX( top, (int)it );
+ left = TQMAX( left, (int)il );
+ bottom = TQMAX( bottom, (int)ib );
+ right = TQMAX( right, (int)ir );
}
d->m_wrapper->setMargins( top, left, bottom, right );
}
@@ -502,8 +502,8 @@ TQValueList<int> KPrinter::pageList() const
if (ok && p1 <= p2)
{
// clip to min/max
- p1 = QMAX(mp,p1);
- p2 = QMIN(MP,p2);
+ p1 = TQMAX(mp,p1);
+ p2 = TQMIN(MP,p2);
for (int i=p1;i<=p2;i++)
list.append(i);
}
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 8ab3a7279..5cd37c948 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -68,13 +68,13 @@ void KMIconViewItem::calcRect(const TQString&)
if (m_mode == TQIconView::Bottom)
{
ir.setHeight(pr.height() + tr.height() + 15);
- ir.setWidth(QMAX(pr.width(), tr.width()) + 10);
+ ir.setWidth(TQMAX(pr.width(), tr.width()) + 10);
pr = TQRect((ir.width()-pr.width())/2, 5, pr.width(), pr.height());
tr = TQRect((ir.width()-tr.width())/2, 10+pr.height(), tr.width(), tr.height());
}
else
{
- ir.setHeight(QMAX(pr.height(), tr.height()) + 4);
+ ir.setHeight(TQMAX(pr.height(), tr.height()) + 4);
ir.setWidth(pr.width() + tr.width() + 6);
pr = TQRect(2, (ir.height()-pr.height())/2, pr.width(), pr.height());
tr = TQRect(4+pr.width(), (ir.height()-tr.height())/2, tr.width(), tr.height());
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index a45a9caa0..a0b1aa78d 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -63,7 +63,7 @@ void KMTimer::release(bool do_emit)
void KMTimer::releaseTimer(bool do_emit)
{
- m_count = QMAX(0, m_count-1);
+ m_count = TQMAX(0, m_count-1);
if (m_count == 0)
{
if (do_emit)
diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp
index 0839af3d7..cb66fe469 100644
--- a/tdeprint/posterpreview.cpp
+++ b/tdeprint/posterpreview.cpp
@@ -118,15 +118,15 @@ void PosterPreview::drawContents( TQPainter *painter )
TQSimpleRichText richtext( ( m_buffer.isEmpty() ? txt : m_buffer.prepend( "<pre>" ).append( "</pre>" ) ), p->font() );
richtext.adjustSize();
int x = ( width()-richtext.widthUsed() )/2, y = ( height()-richtext.height() )/2;
- x = QMAX( x, 0 );
- y = QMAX( y, 0 );
+ x = TQMAX( x, 0 );
+ y = TQMAX( y, 0 );
richtext.draw( p, x, y, TQRect( x, y, richtext.widthUsed(), richtext.height() ), colorGroup() );
m_boundingrect = TQRect();
}
else
{
int totalx = m_cols*m_pw, totaly = m_rows*m_ph;
- float scale = QMIN( float( width()-1 )/totalx, float( height()-1 )/totaly );
+ float scale = TQMIN( float( width()-1 )/totalx, float( height()-1 )/totaly );
p->translate( 0, height()-1 );
p->scale( scale, -scale );
int x = ( int )( width()/scale-totalx )/2, y = ( int )( height()/scale-totaly )/2;
@@ -143,7 +143,7 @@ void PosterPreview::drawContents( TQPainter *painter )
p->fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? TDEGlobalSettings::highlightColor() : white ) );
p->drawRect( x, y, m_pw, m_ph );
if ( pw > 0 && ph > 0 )
- p->fillRect( x+m_mw+px, y+m_mh+py, QMIN( pw, m_pw-2*m_mw-px ), QMIN( ph, m_ph-2*m_mh-py ),
+ p->fillRect( x+m_mw+px, y+m_mh+py, TQMIN( pw, m_pw-2*m_mw-px ), TQMIN( ph, m_ph-2*m_mh-py ),
( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) );
p->setPen( Qt::DotLine );
p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh );
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index 71d4a0680..76226e200 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -142,7 +142,7 @@ DrawView::DrawView()
TQFontMetrics fm = bgroup->fontMetrics();
for ( i=0; (n=ourDrawFunctions[i].name) != 0; i++ ) {
int w = fm.width( n );
- maxwidth = QMAX(w,maxwidth);
+ maxwidth = TQMAX(w,maxwidth);
}
maxwidth = maxwidth + 20; // add 20 pixels
diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp
index a27b68289..5cee0cacc 100644
--- a/tdeprint/treecombobox.cpp
+++ b/tdeprint/treecombobox.cpp
@@ -82,7 +82,7 @@ int TreeListBoxItem::width(const TQListBox *lb) const
w += (pixmap()->width() + 2);
if (!m_path[m_depth].isEmpty())
w += (lb->fontMetrics().width(m_path[m_depth]) + 2);
- return QMAX(w, TQListBoxPixmap::width(lb));
+ return TQMAX(w, TQListBoxPixmap::width(lb));
}
void TreeListBoxItem::paint(TQPainter *p)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 13:30:20 +0000