Synch with kde-current, kill values.h entirely.
This commit is contained in:
espie
parent
f540762543
commit
5eec0526af
@ -1,18 +1,21 @@
|
||||
$OpenBSD: patch-khexedit_chartabledialog_cc,v 1.1.1.1 2002/04/04 14:23:48 espie Exp $
|
||||
--- khexedit/chartabledialog.cc.orig Thu Apr 4 15:31:17 2002
|
||||
+++ khexedit/chartabledialog.cc Thu Apr 4 15:39:19 2002
|
||||
@@ -18,7 +18,14 @@
|
||||
$OpenBSD: patch-khexedit_chartabledialog_cc,v 1.2 2002/04/15 06:49:55 espie Exp $
|
||||
--- khexedit/chartabledialog.cc.orig Wed Apr 10 16:28:45 2002
|
||||
+++ khexedit/chartabledialog.cc Wed Apr 10 16:29:00 2002
|
||||
@@ -18,7 +18,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <float.h>
|
||||
-#include <values.h>
|
||||
+#include <limits.h>
|
||||
+#include <math.h>
|
||||
+#define MAXINT INT_MAX
|
||||
+#else
|
||||
#include <values.h>
|
||||
+#endif
|
||||
|
||||
#include <qlabel.h>
|
||||
#include <qheader.h>
|
||||
@@ -73,7 +73,7 @@ CCharTableDialog::CCharTableDialog( QWid
|
||||
|
||||
mInputCountSpin = new QSpinBox( plainPage(), "spin" );
|
||||
mInputCountSpin->setMinimumWidth( fontMetrics().maxWidth()*7 );
|
||||
- mInputCountSpin->setRange( 1, MAXINT );
|
||||
+ mInputCountSpin->setRange( 1, INT_MAX );
|
||||
mInputCountSpin->setValue( 1 );
|
||||
hbox->addWidget( mInputCountSpin );
|
||||
|
||||
|
||||
@ -1,18 +1,39 @@
|
||||
$OpenBSD: patch-khexedit_dialog_cc,v 1.1.1.1 2002/04/04 14:23:48 espie Exp $
|
||||
--- khexedit/dialog.cc.orig Thu Apr 4 15:31:17 2002
|
||||
+++ khexedit/dialog.cc Thu Apr 4 15:39:06 2002
|
||||
@@ -20,7 +20,14 @@
|
||||
$OpenBSD: patch-khexedit_dialog_cc,v 1.2 2002/04/15 06:49:55 espie Exp $
|
||||
--- khexedit/dialog.cc.orig Wed Apr 10 16:25:45 2002
|
||||
+++ khexedit/dialog.cc Wed Apr 10 16:26:10 2002
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <ctype.h>
|
||||
#include <iostream>
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <float.h>
|
||||
-#include <values.h>
|
||||
+#include <limits.h>
|
||||
+#include <math.h>
|
||||
+#define MAXINT INT_MAX
|
||||
+#else
|
||||
#include <values.h>
|
||||
+#endif
|
||||
|
||||
#include <qbuttongroup.h>
|
||||
#include <qfileinfo.h>
|
||||
@@ -943,7 +943,7 @@ void CFilterDialog::makeRotateLayout( vo
|
||||
mGroupSpin = new QSpinBox( page );
|
||||
if( mGroupSpin == 0 ) { return; }
|
||||
mGroupSpin->setMinimumWidth( fontMetrics().width("M")*20 );
|
||||
- mGroupSpin->setRange(1, MAXINT );
|
||||
+ mGroupSpin->setRange(1, INT_MAX );
|
||||
|
||||
text = i18n("&Group size [bytes]");
|
||||
QLabel *label = new QLabel( mGroupSpin, text, page );
|
||||
@@ -955,7 +955,7 @@ void CFilterDialog::makeRotateLayout( vo
|
||||
mBitSpin = new QSpinBox( page );
|
||||
if( mBitSpin == 0 ) { return; }
|
||||
mBitSpin->setMinimumWidth( fontMetrics().width("M")*20 );
|
||||
- mBitSpin->setRange(-MAXINT, MAXINT);
|
||||
+ mBitSpin->setRange(INT_MIN, INT_MAX);
|
||||
|
||||
text = i18n("S&hift size [bits]");
|
||||
label = new QLabel( mBitSpin, text, page );
|
||||
@@ -1101,7 +1101,7 @@ CInsertDialog::CInsertDialog( QWidget *p
|
||||
mSizeBox = new QSpinBox( plainPage() );
|
||||
if( mSizeBox == 0 ) { return; }
|
||||
mSizeBox->setMinimumWidth( fontMetrics().maxWidth()*17 );
|
||||
- mSizeBox->setRange( 1, MAXINT );
|
||||
+ mSizeBox->setRange( 1, INT_MAX );
|
||||
mSizeBox->setValue( 1 );
|
||||
|
||||
QLabel *label = new QLabel( mSizeBox, i18n("&Size"), plainPage() );
|
||||
|
||||
@ -1,18 +1,30 @@
|
||||
$OpenBSD: patch-khexedit_exportdialog_cc,v 1.1.1.1 2002/04/04 14:23:48 espie Exp $
|
||||
--- khexedit/exportdialog.cc.orig Thu Apr 4 15:31:17 2002
|
||||
+++ khexedit/exportdialog.cc Thu Apr 4 15:39:22 2002
|
||||
@@ -18,7 +18,14 @@
|
||||
$OpenBSD: patch-khexedit_exportdialog_cc,v 1.2 2002/04/15 06:49:55 espie Exp $
|
||||
--- khexedit/exportdialog.cc.orig Wed Apr 10 16:29:15 2002
|
||||
+++ khexedit/exportdialog.cc Wed Apr 10 16:29:31 2002
|
||||
@@ -18,7 +18,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <float.h>
|
||||
-#include <values.h>
|
||||
+#include <limits.h>
|
||||
+#include <math.h>
|
||||
+#define MAXINT INT_MAX
|
||||
+#else
|
||||
#include <values.h>
|
||||
+#endif
|
||||
|
||||
#include <qbuttongroup.h>
|
||||
#include <qlineedit.h>
|
||||
@@ -312,7 +312,7 @@ void CExportDialog::makeHtmlOption( void
|
||||
|
||||
mHtml.lineSpin = new QSpinBox( frame );
|
||||
mHtml.lineSpin->setMinimumWidth( fontMetrics().maxWidth()*10 );
|
||||
- mHtml.lineSpin->setRange( 5, MAXINT );
|
||||
+ mHtml.lineSpin->setRange( 5, INT_MAX );
|
||||
gbox->addWidget( mHtml.lineSpin, 0, 1 );
|
||||
|
||||
text = i18n("&Lines per table");
|
||||
@@ -423,7 +423,7 @@ void CExportDialog::makeCArrayOption( vo
|
||||
|
||||
mArray.lineSizeSpin = new QSpinBox( page );
|
||||
mArray.lineSizeSpin->setMinimumWidth( fontMetrics().maxWidth()*10 );
|
||||
- mArray.lineSizeSpin->setRange( 1, MAXINT );
|
||||
+ mArray.lineSizeSpin->setRange( 1, INT_MAX );
|
||||
gbox->addWidget( mArray.lineSizeSpin, 2, 1 );
|
||||
text = i18n("Elements per line:");
|
||||
label = new QLabel( mArray.lineSizeSpin, text, page );
|
||||
|
||||
@ -1,18 +1,21 @@
|
||||
$OpenBSD: patch-khexedit_optiondialog_cc,v 1.1.1.1 2002/04/04 14:23:48 espie Exp $
|
||||
--- khexedit/optiondialog.cc.orig Thu Apr 4 15:31:17 2002
|
||||
+++ khexedit/optiondialog.cc Thu Apr 4 15:39:13 2002
|
||||
@@ -23,7 +23,14 @@
|
||||
$OpenBSD: patch-khexedit_optiondialog_cc,v 1.2 2002/04/15 06:49:55 espie Exp $
|
||||
--- khexedit/optiondialog.cc.orig Wed Apr 10 16:26:46 2002
|
||||
+++ khexedit/optiondialog.cc Wed Apr 10 16:27:14 2002
|
||||
@@ -23,8 +23,6 @@
|
||||
#include <qvbuttongroup.h>
|
||||
#include <qpainter.h>
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <float.h>
|
||||
+#include <limits.h>
|
||||
+#include <math.h>
|
||||
+#define MAXINT INT_MAX
|
||||
+#else
|
||||
#include <values.h>
|
||||
+#endif
|
||||
|
||||
-#include <values.h>
|
||||
-
|
||||
#include <qcheckbox.h>
|
||||
#include <qlayout.h>
|
||||
#include <qlabel.h>
|
||||
@@ -486,7 +484,7 @@ void COptionDialog::setupMiscPage( void
|
||||
|
||||
mMisc.thresholdSpin = new QSpinBox( page );
|
||||
mMisc.thresholdSpin->setMinimumWidth( fontMetrics().width("M") * 10 );
|
||||
- mMisc.thresholdSpin->setRange( 5, MAXINT );
|
||||
+ mMisc.thresholdSpin->setRange( 5, INT_MAX );
|
||||
mMisc.thresholdSpin->setSteps( 5, 5 );
|
||||
mMisc.thresholdSpin->setValue( 5 );
|
||||
|
||||
|
||||
@ -1,18 +1,30 @@
|
||||
$OpenBSD: patch-khexedit_printerdialog_cc,v 1.1.1.1 2002/04/04 14:23:48 espie Exp $
|
||||
--- khexedit/printerdialog.cc.orig Thu Apr 4 15:31:17 2002
|
||||
+++ khexedit/printerdialog.cc Thu Apr 4 15:39:17 2002
|
||||
@@ -18,7 +18,14 @@
|
||||
$OpenBSD: patch-khexedit_printerdialog_cc,v 1.2 2002/04/15 06:49:55 espie Exp $
|
||||
--- khexedit/printerdialog.cc.orig Wed Apr 10 16:27:30 2002
|
||||
+++ khexedit/printerdialog.cc Wed Apr 10 16:28:00 2002
|
||||
@@ -18,8 +18,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#ifdef __OpenBSD__
|
||||
+#include <float.h>
|
||||
+#include <limits.h>
|
||||
+#include <math.h>
|
||||
+#define MAXINT INT_MAX
|
||||
+#else
|
||||
#include <values.h>
|
||||
+#endif
|
||||
|
||||
-#include <values.h>
|
||||
-
|
||||
#include <qbuttongroup.h>
|
||||
#include <qfileinfo.h>
|
||||
#include <qlayout.h>
|
||||
@@ -580,7 +578,7 @@ void CPrinterDialog::setupOptionPage( vo
|
||||
mOption.pageSpin->setFixedHeight( mOption.pageSpin->sizeHint().height() );
|
||||
mOption.pageSpin->setMinimumWidth(
|
||||
mOption.pageSpin->fontMetrics().width("M")*10 );
|
||||
- mOption.pageSpin->setRange( 1, MAXINT );
|
||||
+ mOption.pageSpin->setRange( 1, INT_MAX );
|
||||
|
||||
text = i18n("&Number of copies");
|
||||
QLabel *pageLabel = new QLabel( mOption.pageSpin, text, page );
|
||||
@@ -697,7 +695,7 @@ void CPrinterDialog::setupLayoutPage( vo
|
||||
mLayout.marginSpin[i]->sizeHint().height() );
|
||||
mLayout.marginSpin[i]->setMinimumWidth(
|
||||
mLayout.marginSpin[i]->fontMetrics().width("M")*10 );
|
||||
- mLayout.marginSpin[i]->setRange( 0, MAXINT );
|
||||
+ mLayout.marginSpin[i]->setRange( 0, INT_MAX );
|
||||
|
||||
QLabel *label = new QLabel( mLayout.marginSpin[i], name[i], group );
|
||||
label->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() );
|
||||
|
||||
Loading…
Reference in New Issue
Block a user