[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: [patch] kdegraphics NO_COMPAT
From: Per Winkvist <nd96pwt () adeptus ! student ! hig ! se>
Date: 2002-01-04 14:28:53
[Download RAW message or body]
Hi,
Here is a patch to kdegraphics to make it compile with QT_NO_COMPAT. It
fixes all places except one which is kpaint/kpalettedialog.cpp:17 \
(button->setAutoResize) I don't know where that button is (can't start kpaint due to \
qt error).
It mostly compiles with KDE_NO_COMPAT too except from kaccel/kaction incomp.
Thanks,
Per
Index: kdegraphics/kfax/fax2ps.c
===================================================================
RCS file: /home/kde/kdegraphics/kfax/fax2ps.c,v
retrieving revision 1.4
diff -u -3 -p -r1.4 fax2ps.c
--- kdegraphics/kfax/fax2ps.c 2001/02/18 05:39:05 1.4
+++ kdegraphics/kfax/fax2ps.c 2002/01/04 14:43:45
@@ -456,18 +456,17 @@ fax2psmainoriginal(int argc, char** argv
} while (++optind < argc);
} else {
int n;
- FILE* fd;
+ int fd;
char temp[1024], buf[16*1024];
strcpy(temp, "/tmp/fax2psXXXXXX");
- (void) mktemp(temp);
- fd = fopen(temp, "w");
- if (fd == NULL) {
+ fd = mkstemp(temp);
+ if (fd == -1) {
fprintf(stderr, "Could not create temp file \"%s\"\n", temp);
exit(-2);
}
while ((n = read(fileno(stdin), buf, sizeof (buf))) > 0)
- write(fileno(fd), buf, n);
+ write(fd, buf, n);
tif = TIFFOpen(temp, "r");
unlink(temp);
if (tif) {
@@ -475,7 +474,7 @@ fax2psmainoriginal(int argc, char** argv
TIFFClose(tif);
} else
fprintf(stderr, "%s: Can not open, or not a TIFF file.\n", temp);
- fclose(fd);
+ close(fd);
}
printf("%%%%Trailer\n");
printf("%%%%Pages: %u\n", totalPages);
Index: kdegraphics/kfax/kfax.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kfax/kfax.cpp,v
retrieving revision 1.62
diff -u -3 -p -r1.62 kfax.cpp
--- kdegraphics/kfax/kfax.cpp 2001/12/18 18:34:48 1.62
+++ kdegraphics/kfax/kfax.cpp 2002/01/04 14:43:50
@@ -1086,8 +1086,8 @@ void TopLevel::readSettings()
pi.lpr = config->readNumEntry("print", 1);
pi.scale = config->readNumEntry("scale", 0);
pi.margins = config->readNumEntry("margins", 0);
- pi.xmargin = config->readNumEntry("xmargin", 0.0);
- pi.ymargin = config->readNumEntry("ymargin", 0.0);
+ pi.xmargin = config->readDoubleNumEntry("xmargin", 0.0);
+ pi.ymargin = config->readDoubleNumEntry("ymargin", 0.0);
pi.pagesize = config->readEntry("PageSize",US_LETTER);
}
Index: kdegraphics/kfaxview/kfax_multipage.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kfaxview/kfax_multipage.cpp,v
retrieving revision 1.16
diff -u -3 -p -r1.16 kfax_multipage.cpp
--- kdegraphics/kfaxview/kfax_multipage.cpp 2001/10/10 17:57:33 1.16
+++ kdegraphics/kfaxview/kfax_multipage.cpp 2002/01/04 14:43:51
@@ -204,8 +204,8 @@ bool KFaxMultiPage::gotoPage(int page)
if (!fp)
return false;
- int w = (int)_zoom*672.0;
- int h = (int)_zoom*825.0;
+ int w = (int) (_zoom*672.0);
+ int h = (int) (_zoom*825.0);
fp->scale(w, h, antiAct->isChecked());
window->setBackgroundPixmap(fp->scaledPixmap());
window->resize(w, h);
@@ -224,8 +224,8 @@ double KFaxMultiPage::setZoom(double zoo
KFaxPage *fp = faxPages.at(_currentPage);
if (!fp)
return 0;
- fp->scale((int)672.0*zoom, (int)825.0*zoom, antiAct->isChecked());
- window->resize((int)672.0*zoom, (int)825.0*zoom);
+ fp->scale((int)(672.0*zoom), (int)(825.0*zoom), antiAct->isChecked());
+ window->resize((int)(672.0*zoom), (int)(825.0*zoom));
window->setBackgroundPixmap(fp->scaledPixmap());
scrollView()->resizeContents(window->width(), window->height());
_zoom = zoom;
Index: kdegraphics/kghostview/marklist.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kghostview/marklist.cpp,v
retrieving revision 1.33
diff -u -3 -p -r1.33 marklist.cpp
--- kdegraphics/kghostview/marklist.cpp 2001/10/10 17:57:45 1.33
+++ kdegraphics/kghostview/marklist.cpp 2002/01/04 14:43:52
@@ -67,7 +67,7 @@ MarkListTable::MarkListTable( QWidget *
void MarkListTable::initPixmaps()
{
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
int w = cellWidth(0);
int h = cellHeight(0);
@@ -127,7 +127,7 @@ void MarkListTable::setAutoUpdate ( bool
void MarkListTable::clear()
{
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
if( backgroundColor() != cg.base() )
setBackgroundColor(cg.base());
items.clear();
@@ -145,7 +145,7 @@ int MarkListTable::cellWidth( int col )
void MarkListTable::paintCell( QPainter* p, int row, int col )
{
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
if( col == 0 ) {
if( items.at( row )->isMarked() )
@@ -378,7 +378,7 @@ void MarkList::wheelEvent( QWheelEvent*
QPixmap MarkList::flagPixmap()
{
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
QPixmap pm;
pm.resize(16,16);
Index: kdegraphics/kiconedit/kicongrid.h
===================================================================
RCS file: /home/kde/kdegraphics/kiconedit/kicongrid.h,v
retrieving revision 1.23
diff -u -3 -p -r1.23 kicongrid.h
--- kdegraphics/kiconedit/kicongrid.h 2001/11/03 14:21:01 1.23
+++ kdegraphics/kiconedit/kicongrid.h 2002/01/04 14:43:53
@@ -30,11 +30,7 @@
#include <qbuffer.h>
#include <qclipboard.h>
#include <qfileinfo.h>
-#if QT_VERSION >= 140
#include <qgroupbox.h>
-#else
-#include <qgroupbox.h>
-#endif
#include <qbuttongroup.h>
#include <qcursor.h>
#include <qlayout.h>
Index: kdegraphics/kiconedit/kresize.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kiconedit/kresize.cpp,v
retrieving revision 1.15
diff -u -3 -p -r1.15 kresize.cpp
--- kdegraphics/kiconedit/kresize.cpp 2000/12/03 17:35:35 1.15
+++ kdegraphics/kiconedit/kresize.cpp 2002/01/04 14:43:53
@@ -118,7 +118,7 @@ KResizeDialog::~KResizeDialog()
bool KResizeDialog::eventFilter(QObject *obj, QEvent *e)
{
- if ( e->type() == QEvent::KeyPress && obj == this && !testWFlags(WType_Modal))
+ if ( e->type() == QEvent::KeyPress && obj == this && !testWFlags(Qt::WType_Dialog \
| Qt::WShowModal)) {
QKeyEvent *k = (QKeyEvent*)e;
if(k->key() == Key_Escape || k->key() == Key_Return || k->key() == Key_Enter)
Index: kdegraphics/kiconedit/utils.h
===================================================================
RCS file: /home/kde/kdegraphics/kiconedit/utils.h,v
retrieving revision 1.13
diff -u -3 -p -r1.13 utils.h
--- kdegraphics/kiconedit/utils.h 2001/11/03 14:21:01 1.13
+++ kdegraphics/kiconedit/utils.h 2002/01/04 14:43:53
@@ -38,7 +38,7 @@
#ifdef TRANSPARENT
#undef TRANSPARENT
#endif
-#define TRANSPARENT QApplication::palette().normal().background().rgb()
+#define TRANSPARENT QApplication::palette().active().background().rgb()
const uint iconpalette[42] = { // kde palette
0x303030,0x585858,0x808080,0xa0a0a0,0xc3c3c3,0xdcdcdc,
Index: kdegraphics/kooka/kookaview.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kooka/kookaview.cpp,v
retrieving revision 1.26
diff -u -3 -p -r1.26 kookaview.cpp
--- kdegraphics/kooka/kookaview.cpp 2001/12/03 13:42:48 1.26
+++ kdegraphics/kooka/kookaview.cpp 2002/01/04 14:43:56
@@ -86,7 +86,7 @@ KookaView::KookaView(QWidget *parent)
/* the object from the kscan lib to handle low level scanning */
sane = new KScanDevice( this );
- CHECK_PTR(sane);
+ Q_CHECK_PTR(sane);
// connect( sane, SIGNAL( sigCloseDevice()), this, SLOT( slCloseScanDevice()));
/* select the scan device, either user or from config, this creates and assembles
@@ -226,7 +226,7 @@ bool KookaView::slSelectDevice( )
}
/* This connects to the selected scanner */
scan_params = new ScanParams( paramSplitter );
- CHECK_PTR(scan_params);
+ Q_CHECK_PTR(scan_params);
if( sane->openDevice( selDevice ) == KSCAN_OK )
{
@@ -465,7 +465,7 @@ void KookaView::startOCR( const QImage *
if( ocrFabric == 0L )
ocrFabric = new KSANEOCR(this );
- CHECK_PTR( ocrFabric );
+ Q_CHECK_PTR( ocrFabric );
ocrFabric->setImage( img );
if( !ocrFabric->startExternOcrVisible() )
Index: kdegraphics/kooka/scanpackager.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kooka/scanpackager.cpp,v
retrieving revision 1.31
diff -u -3 -p -r1.31 scanpackager.cpp
--- kdegraphics/kooka/scanpackager.cpp 2001/12/09 19:01:09 1.31
+++ kdegraphics/kooka/scanpackager.cpp 2002/01/04 14:43:58
@@ -453,7 +453,7 @@ void ScanPackager::loadImageForItem( KFi
if( url.isLocalFile() )
{
KookaImage *img = new KookaImage( );
- if( img->load( localFilename(item) ) )
+ if( img->load( localFileName(item) ) )
{
slImageArrived( item, img );
}
@@ -496,13 +496,13 @@ QString ScanPackager::getCurrImageFileNa
{
if( withPath )
{
- result = localFilename(curr);
+ result = localFileName(curr);
}
else
{
- KURL url( localFilename(curr));
+ KURL url( localFileName(curr));
url = curr->url();
- result = url.filename();
+ result = url.fileName();
}
}
return( result );
@@ -525,13 +525,13 @@ QCString ScanPackager::getImgFormat( KFi
// TODO find the real extension for use with the filename !
// temporarely:
- QString f = localFilename( item );
+ QString f = localFileName( item );
return( QImage::imageFormat( f ));
}
-QString ScanPackager::localFilename( KFileTreeViewItem *it ) const
+QString ScanPackager::localFileName( KFileTreeViewItem *it ) const
{
if( ! it ) return( QString::null );
@@ -545,7 +545,7 @@ QString ScanPackager::localFilename( KFi
}
else
{
- kdDebug(28000)<< "localFilename not possible, file is not local !" << endl;
+ kdDebug(28000)<< "localFileName not possible, file is not local !" << endl;
return( QString::null );
}
@@ -566,7 +566,7 @@ void ScanPackager::slotImageChanged( QIm
/* find the directory above */
- const QString filename = localFilename( curr );
+ const QString filename = localFileName( curr );
const QCString format = getImgFormat( curr );
ImgSaver saver( this );
ImgSaveStat is_stat = ISS_OK;
@@ -828,7 +828,7 @@ void ScanPackager::slotDeleteItems( )
bool ok = false;
KFileTreeViewItem *curr = currentKFileTreeViewItem();
if( ! curr ) return;
- kdDebug(28000) << "Deleting: " << localFilename(curr) << endl;
+ kdDebug(28000) << "Deleting: " << localFileName(curr) << endl;
if( curr->isDir() )
{
#if 0
Index: kdegraphics/kooka/scanpackager.h
===================================================================
RCS file: /home/kde/kdegraphics/kooka/scanpackager.h,v
retrieving revision 1.18
diff -u -3 -p -r1.18 scanpackager.h
--- kdegraphics/kooka/scanpackager.h 2001/12/09 19:01:10 1.18
+++ kdegraphics/kooka/scanpackager.h 2002/01/04 14:43:58
@@ -105,7 +105,7 @@ signals:
void galleryPathSelected( KFileTreeBranch* branch, const QString& \
relativPath );
private:
- QString localFilename( KFileTreeViewItem* it ) const;
+ QString localFileName( KFileTreeViewItem* it ) const;
void loadImageForItem( KFileTreeViewItem* item );
void createMenus();
void openRoots();
Index: kdegraphics/ksnapshot/ksnapshot.cpp
===================================================================
RCS file: /home/kde/kdegraphics/ksnapshot/ksnapshot.cpp,v
retrieving revision 1.35
diff -u -3 -p -r1.35 ksnapshot.cpp
--- kdegraphics/ksnapshot/ksnapshot.cpp 2001/10/12 16:04:48 1.35
+++ kdegraphics/ksnapshot/ksnapshot.cpp 2002/01/04 14:44:00
@@ -177,7 +177,8 @@ void KSnapshot::autoincFilename()
// Does it have a number?
int len;
- int start= numSearch.match(name, 0, &len);
+ int start= numSearch.search(name, 0);
+ len = numSearch.matchedLength();
if (start != -1) {
// It has a number
QString numAsStr= name.mid(start, len);
Index: kdegraphics/kview/canvas.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kview/canvas.cpp,v
retrieving revision 1.37
diff -u -3 -p -r1.37 canvas.cpp
--- kdegraphics/kview/canvas.cpp 2001/10/24 16:49:12 1.37
+++ kdegraphics/kview/canvas.cpp 2002/01/04 14:44:01
@@ -335,6 +335,7 @@ void KImageCanvas::slot_setImage( const
transPixmap();
QPixmap pixmap;
+
pixmap.convertFromImage( image );
_client->setImagePix( pixmap );
@@ -420,6 +421,7 @@ void KImageCanvas::slot_maxToWin()
QPixmap image = *_orig;
QApplication::setOverrideCursor( WaitCursor );
+
image.convertFromImage(image.convertToImage().smoothScale(
width(),height()));
_client->setImagePix( image );
Index: kdegraphics/kview/infowin.h
===================================================================
RCS file: /home/kde/kdegraphics/kview/infowin.h,v
retrieving revision 1.1
diff -u -3 -p -r1.1 infowin.h
--- kdegraphics/kview/infowin.h 2001/05/15 19:54:32 1.1
+++ kdegraphics/kview/infowin.h 2002/01/04 14:44:01
@@ -26,7 +26,7 @@ class InfoWin : public InfoWin_Base
{
Q_OBJECT
public:
- InfoWin( QWidget* parent = 0, const char* name = "Info Window", WFlags fl = \
WType_TopLevel | WStyle_Dialog ); + InfoWin( QWidget* parent = 0, const char* name = \
"Info Window", WFlags fl = Qt::WType_TopLevel | Qt::WType_Dialog ); ~InfoWin();
void setDimensions( int, int );
Index: kdegraphics/kviewshell/kviewshell.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kviewshell/kviewshell.cpp,v
retrieving revision 1.22
diff -u -3 -p -r1.22 kviewshell.cpp
--- kdegraphics/kviewshell/kviewshell.cpp 2001/12/02 14:30:56 1.22
+++ kdegraphics/kviewshell/kviewshell.cpp 2002/01/04 14:44:02
@@ -224,7 +224,7 @@ void KViewShell::dragEnterEvent(QDragEnt
ext = ext.left(pos);
QRegExp re(ext, false, true);
- if (re.match(urls[0]) >= 0)
+ if (re.search(urls[0]) >= 0)
{
event->accept(true);
return;
Index: kdegraphics/kviewshell/marklist.cpp
===================================================================
RCS file: /home/kde/kdegraphics/kviewshell/marklist.cpp,v
retrieving revision 1.8
diff -u -3 -p -r1.8 marklist.cpp
--- kdegraphics/kviewshell/marklist.cpp 2001/10/10 17:57:49 1.8
+++ kdegraphics/kviewshell/marklist.cpp 2002/01/04 14:44:02
@@ -46,7 +46,7 @@ MarkListTable::MarkListTable( QWidget *
pup->insertItem( i18n("Toggle page marks"), this, SLOT(toggleMarks()) );
pup->insertItem( i18n("Remove page marks"), this, SLOT(removeMarks()) );
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
selectColor = QColor( cg.highlight() );
selectTextColor = QColor( cg.highlightedText() );
@@ -55,7 +55,7 @@ MarkListTable::MarkListTable( QWidget *
void MarkListTable::initPixmaps()
{
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
int w = cellWidth(0);
int h = cellHeight(0);
@@ -115,7 +115,7 @@ void MarkListTable::setAutoUpdate ( bool
void MarkListTable::clear()
{
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
if( backgroundColor() != cg.base() )
setBackgroundColor(cg.base());
items.clear();
@@ -135,7 +135,7 @@ int MarkListTable::cellWidth( int col )
void
MarkListTable::paintCell( QPainter *p, int row, int col)
{
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
if ( col == 0 )
{
@@ -443,7 +443,7 @@ QStringList MarkList::markList()
}
QPixmap MarkList::flagPixmap() {
- QColorGroup cg = QApplication::palette().normal();
+ QColorGroup cg = QApplication::palette().active();
QPixmap pm;
pm.resize(16,16);
Index: kdegraphics/libkscan/img_canvas.cpp
===================================================================
RCS file: /home/kde/kdegraphics/libkscan/img_canvas.cpp,v
retrieving revision 1.12
diff -u -3 -p -r1.12 img_canvas.cpp
--- kdegraphics/libkscan/img_canvas.cpp 2001/10/10 17:57:49 1.12
+++ kdegraphics/libkscan/img_canvas.cpp 2002/01/04 14:44:05
@@ -275,7 +275,7 @@ void ImageCanvas::handle_popup( int item
/* substract for scrollbar */
scale = 100*(width() -25)/image->width();
}
- setScaleFactor( scale );
+ setScaleFactor( static_cast<int>(scale) );
repaint( true );
QApplication::restoreOverrideCursor();
break;
@@ -289,7 +289,7 @@ void ImageCanvas::handle_popup( int item
/* substract for scrollbar */
scale = 100*(height() -25)/image->height();
}
- setScaleFactor( scale );
+ setScaleFactor( static_cast<int>(scale) );
repaint( true );
QApplication::restoreOverrideCursor();
break;
@@ -413,12 +413,12 @@ void ImageCanvas::newRectSlot( QRect new
{
int h = image->width();
//kdDebug(29000) << "ImageCanvas got selection Rect: W=" << newSel.width() << \
", H=" << newSel.height() << endl;
- to_map.setWidth(h * newSel.width() / 1000.0);
- to_map.setX( h * newSel.x() / 1000.0 );
+ to_map.setWidth(static_cast<int>(h * newSel.width() / 1000.0));
+ to_map.setX( static_cast<int>(h * newSel.x() / 1000.0 ));
h = image->height();
- to_map.setHeight( h * newSel.height() / 1000.0 );
- to_map.setY( h * newSel.y() / 1000.0 );
+ to_map.setHeight( static_cast<int>(h * newSel.height() / 1000.0 ));
+ to_map.setY( static_cast<int>(h * newSel.y() / 1000.0 ));
*selected = scale_matrix.map( to_map );
emit( newRect( sel() ));
@@ -710,8 +710,8 @@ void ImageCanvas::update_scaled_pixmap(
* with redrawing of new images.
*/
resizeContents( 0,0 );
- resizeContents( image->width() * used_xscaler,
- image->height() * used_yscaler );
+ resizeContents( static_cast<int>(image->width() * used_xscaler),
+ static_cast<int>(image->height() * used_yscaler ) );
}
Index: kdegraphics/libkscan/massscandialog.cpp
===================================================================
RCS file: /home/kde/kdegraphics/libkscan/massscandialog.cpp,v
retrieving revision 1.4
diff -u -3 -p -r1.4 massscandialog.cpp
--- kdegraphics/libkscan/massscandialog.cpp 2001/07/18 09:15:32 1.4
+++ kdegraphics/libkscan/massscandialog.cpp 2002/01/04 14:44:05
@@ -17,6 +17,7 @@
#include <qlayout.h>
#include <qlabel.h>
+#include <qprogressbar.h>
#include <qgroupbox.h>
#include <qframe.h>
@@ -28,7 +29,7 @@
#include "massscandialog.h"
MassScanDialog::MassScanDialog( QWidget *parent )
- :QSemiModal( parent, "MASS_SCAN", true )
+ :QDialog( parent, "MASS_SCAN", true )
{
setCaption( i18n( "ADF Scanning" ));
kdDebug(29000) << "Starting MassScanDialog!" << endl;
Index: kdegraphics/libkscan/massscandialog.h
===================================================================
RCS file: /home/kde/kdegraphics/libkscan/massscandialog.h,v
retrieving revision 1.2
diff -u -3 -p -r1.2 massscandialog.h
--- kdegraphics/libkscan/massscandialog.h 2001/07/13 14:47:28 1.2
+++ kdegraphics/libkscan/massscandialog.h 2002/01/04 14:44:05
@@ -19,17 +19,17 @@
#ifndef MASSSCANDIALOG_H
#define MASSSCANDIALOG_H
-#include <qlabel.h>
#include <qstring.h>
-#include <qsemimodal.h>
-#include <qprogressbar.h>
+#include <qdialog.h>
+class QProgressBar;
+class QLabel;
/**
*@author Klaas Freitag
*/
-class MassScanDialog : public QSemiModal
+class MassScanDialog : public QDialog
{
Q_OBJECT
public:
Index: kdegraphics/libkscan/previewer.cpp
===================================================================
RCS file: /home/kde/kdegraphics/libkscan/previewer.cpp,v
retrieving revision 1.5
diff -u -3 -p -r1.5 previewer.cpp
--- kdegraphics/libkscan/previewer.cpp 2001/11/28 17:24:32 1.5
+++ kdegraphics/libkscan/previewer.cpp 2002/01/04 14:44:06
@@ -343,8 +343,8 @@ QPoint Previewer::calcPercent( int w_mm,
if( overallWidth < 1.0 || overallHeight < 1.0 ) return( p );
if( sizeUnit == KRuler::Millimetres ) {
- p.setX( 1000.0*w_mm / overallWidth );
- p.setY( 1000.0*h_mm / overallHeight );
+ p.setX( static_cast<int>(1000.0*w_mm / overallWidth) );
+ p.setY( static_cast<int>(1000.0*h_mm / overallHeight) );
} else {
kdDebug(29000) << "ERROR: Only mm supported yet !" << endl;
}
Index: kdegraphics/libkscan/scandialog.cpp
===================================================================
RCS file: /home/kde/kdegraphics/libkscan/scandialog.cpp,v
retrieving revision 1.16
diff -u -3 -p -r1.16 scandialog.cpp
--- kdegraphics/libkscan/scandialog.cpp 2001/10/10 13:36:03 1.16
+++ kdegraphics/libkscan/scandialog.cpp 2002/01/04 14:44:07
@@ -47,7 +47,7 @@ ScanDialog::ScanDialog( QWidget *parent,
QVBox *page = addVBoxPage( i18n("&Scanning") );
splitter = new QSplitter( Horizontal, page, "splitter" );
- CHECK_PTR( splitter );
+ Q_CHECK_PTR( splitter );
m_scanParams = 0;
m_device = new KScanDevice( this );
@@ -56,7 +56,7 @@ ScanDialog::ScanDialog( QWidget *parent,
/* Create a preview widget to the right side of the splitter */
m_previewer = new Previewer( splitter );
- CHECK_PTR(m_previewer );
+ Q_CHECK_PTR(m_previewer );
/* ... and connect to the selector-slots. They communicate user's
* selection to the scanner parameter engine */
/* a new preview signal */
@@ -87,13 +87,13 @@ void ScanDialog::createOptionsTab( void
cb_askOnStart = new QCheckBox( i18n( "&Ask for the scan device on plugin \
startup"), gb ); QToolTip::add( cb_askOnStart,
i18n("You can uncheck this if you do not want to be asked which scanner to use \
on startup."));
- CHECK_PTR( cb_askOnStart );
+ Q_CHECK_PTR( cb_askOnStart );
/* Checkbox for network access */
cb_network = new QCheckBox( i18n( "&Query the network for scan devices"), gb );
QToolTip::add( cb_network,
i18n("Check this if you want to query for configured network scan stations."));
- CHECK_PTR( cb_network );
+ Q_CHECK_PTR( cb_network );
/* Read settings for startup behavior */
@@ -111,7 +111,7 @@ void ScanDialog::createOptionsTab( void
QWidget *spaceEater = new QWidget( page );
- CHECK_PTR( spaceEater );
+ Q_CHECK_PTR( spaceEater );
spaceEater->setSizePolicy( QSizePolicy(QSizePolicy::Expanding, \
QSizePolicy::Expanding) );
}
Index: kdegraphics/libkscan/scanparams.cpp
===================================================================
RCS file: /home/kde/kdegraphics/libkscan/scanparams.cpp,v
retrieving revision 1.21
diff -u -3 -p -r1.21 scanparams.cpp
--- kdegraphics/libkscan/scanparams.cpp 2001/12/09 18:56:40 1.21
+++ kdegraphics/libkscan/scanparams.cpp 2002/01/04 14:44:09
@@ -249,7 +249,7 @@ QScrollView *ScanParams::scannerParams(
/* Pretty-Pixmap */
KScanCombo *cb = (KScanCombo*) so->widget();
- CHECK_PTR(cb);
+ Q_CHECK_PTR(cb);
cb->slSetIcon( pixLineArt, i18n("Lineart") );
cb->slSetIcon( pixLineArt, i18n("Binary" ));
cb->slSetIcon( pixGray, i18n("Gray") );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic