From 19c822c41d0644be3f2bed9ddb86b5f996c0d023 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 20 Feb 2012 18:14:05 -0600 Subject: Fix Q_CHECK_PTR --- libkscan/devselector.cpp | 6 +++--- libkscan/gammadialog.cpp | 8 ++++---- libkscan/imgscaledialog.cpp | 2 +- libkscan/scandialog.cpp | 10 +++++----- libkscan/scanparams.cpp | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'libkscan') diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index 23aa5e0e..00d17c06 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -49,19 +49,19 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, kdDebug(29000) << "Starting DevSelector!" << endl; // Layout-Boxes TQWidget *page = new TQWidget( this ); - Q_CHECK_PTR( page ); + TQ_CHECK_PTR( page ); setMainWidget( page ); TQVBoxLayout *topLayout = new TQVBoxLayout( page, marginHint(), spacingHint() ); TQLabel *label = new TQLabel( page, "captionImage" ); - Q_CHECK_PTR( label ); + TQ_CHECK_PTR( label ); label->setPixmap( TQPixmap( TQString("kookalogo.png") )); label->resize( 100, 350 ); topLayout->addWidget( label ); selectBox = new TQButtonGroup( 1,Qt::Horizontal, i18n( "Select Scan Device" ), page, "ButtonBox"); - Q_CHECK_PTR( selectBox ); + TQ_CHECK_PTR( selectBox ); selectBox->setExclusive( true ); topLayout->addWidget( selectBox ); setScanSources( devList, hrdevList ); diff --git a/libkscan/gammadialog.cpp b/libkscan/gammadialog.cpp index ef8a87a2..548a545e 100644 --- a/libkscan/gammadialog.cpp +++ b/libkscan/gammadialog.cpp @@ -36,7 +36,7 @@ GammaDialog::GammaDialog( TQWidget *parent ) : gt = new KGammaTable(); TQWidget *page = new TQWidget( this ); - Q_CHECK_PTR( page ); + TQ_CHECK_PTR( page ); setMainWidget( page ); /* This connect is for recalculating the table every time a new @@ -65,17 +65,17 @@ GammaDialog::GammaDialog( TQWidget *parent ) : /* Slider Widgets for gamma, brightness, contrast */ wBright = new KScanSlider ( page, i18n("Brightness"), -50.0, 50.0 ); - Q_CHECK_PTR(wBright); + TQ_CHECK_PTR(wBright); wBright->slSetSlider( 0 ); connect( wBright, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setBrightness(int))); wContrast = new KScanSlider ( page, i18n("Contrast") , -50.0, 50.0 ); - Q_CHECK_PTR(wContrast); + TQ_CHECK_PTR(wContrast); wContrast->slSetSlider( 0 ); connect( wContrast, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setContrast(int))); wGamma = new KScanSlider ( page, i18n("Gamma"), 30.0, 300.0 ); - Q_CHECK_PTR(wGamma); + TQ_CHECK_PTR(wGamma); wGamma->slSetSlider(100); connect( wGamma, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setGamma(int))); diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp index f6319a5b..b0250ef8 100644 --- a/libkscan/imgscaledialog.cpp +++ b/libkscan/imgscaledialog.cpp @@ -42,7 +42,7 @@ ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel, // makeMainWidget(); TQButtonGroup *radios = new TQButtonGroup ( 2, Qt::Horizontal, this ); setMainWidget(radios); - Q_CHECK_PTR(radios); + TQ_CHECK_PTR(radios); radios->setTitle( i18n("Select Image Zoom") ); connect( radios, TQT_SIGNAL( clicked( int )), diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index a3b1c23e..ae561cb9 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -75,7 +75,7 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal ) TQVBox *page = addVBoxPage( i18n("&Scanning") ); splitter = new TQSplitter(Qt::Horizontal, page, "splitter" ); - Q_CHECK_PTR( splitter ); + TQ_CHECK_PTR( splitter ); m_scanParams = 0; m_device = new KScanDevice( TQT_TQOBJECT(this) ); @@ -88,7 +88,7 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal ) connect( m_device, TQT_SIGNAL(sigAcquireStart()), this, TQT_SLOT(slotAcquireStart())); /* Create a preview widget to the right side of the splitter */ m_previewer = new Previewer( splitter ); - Q_CHECK_PTR(m_previewer ); + TQ_CHECK_PTR(m_previewer ); /* ... and connect to the selector-slots. They communicate user's * selection to the scanner parameter engine */ @@ -119,13 +119,13 @@ void ScanDialog::createOptionsTab( void ) cb_askOnStart = new TQCheckBox( i18n( "&Ask for the scan device on plugin startup"), gb ); TQToolTip::add( cb_askOnStart, i18n("You can uncheck this if you do not want to be asked which scanner to use on startup.")); - Q_CHECK_PTR( cb_askOnStart ); + TQ_CHECK_PTR( cb_askOnStart ); /* Checkbox for network access */ cb_network = new TQCheckBox( i18n( "&Query the network for scan devices"), gb ); TQToolTip::add( cb_network, i18n("Check this if you want to query for configured network scan stations.")); - Q_CHECK_PTR( cb_network ); + TQ_CHECK_PTR( cb_network ); /* Read settings for startup behavior */ @@ -143,7 +143,7 @@ void ScanDialog::createOptionsTab( void ) TQWidget *spaceEater = new TQWidget( page ); - Q_CHECK_PTR( spaceEater ); + TQ_CHECK_PTR( spaceEater ); spaceEater->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) ); } diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp index 636b96df..896bf92e 100644 --- a/libkscan/scanparams.cpp +++ b/libkscan/scanparams.cpp @@ -139,7 +139,7 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice ) /* load the startup scanoptions */ startupOptset = new KScanOptSet( DEFAULT_OPTIONSET ); - Q_CHECK_PTR( startupOptset ); + TQ_CHECK_PTR( startupOptset ); if( !startupOptset->load( "Startup" ) ) { @@ -241,7 +241,7 @@ TQScrollView *ScanParams::scannerParams( ) /* Pretty-Pixmap */ KScanCombo *cb = (KScanCombo*) so->widget(); - Q_CHECK_PTR(cb); + TQ_CHECK_PTR(cb); // the following strings are not translatable since the sane library does not translate them. // so, if we want icons, we have to keep them non-translated for now. cb->slSetIcon( pixLineArt, "Line art" ); @@ -463,7 +463,7 @@ TQScrollView *ScanParams::scannerParams( ) (void) new TQWidget( hb1 ); /* dummy widget to eat space */ pb_edit_gtable = new TQPushButton( i18n("Edit..."), hb1 ); - Q_CHECK_PTR(pb_edit_gtable); + TQ_CHECK_PTR(pb_edit_gtable); connect( pb_edit_gtable, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slEditCustGamma () ) ); @@ -1003,7 +1003,7 @@ void ScanParams::slAcquirePreview( void ) slMaximalScanSize(); if( ! sane_device ) kdDebug(29000) << "Aeetsch: sane_device is 0 !" << endl; - Q_CHECK_PTR( sane_device ); + TQ_CHECK_PTR( sane_device ); KScanStat stat = sane_device->acquirePreview( gray_preview ); if( stat != KSCAN_OK ) -- cgit v1.2.3