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 --- kghostview/kgvdocument.cpp | 4 ++-- kiconedit/kiconeditslots.cpp | 2 +- kiconedit/kicongrid.cpp | 6 +++--- kiconedit/main.cpp | 4 ++-- kiconedit/utils.cpp | 2 +- kooka/img_saver.cpp | 30 +++++++++++++++--------------- kooka/kocrgocr.cpp | 2 +- kooka/kocrkadmos.cpp | 2 +- kooka/kocrocrad.cpp | 2 +- kooka/kookaview.cpp | 6 +++--- kooka/ksaneocr.cpp | 4 ++-- kooka/scanpackager.cpp | 2 +- libkscan/devselector.cpp | 6 +++--- libkscan/gammadialog.cpp | 8 ++++---- libkscan/imgscaledialog.cpp | 2 +- libkscan/scandialog.cpp | 10 +++++----- libkscan/scanparams.cpp | 8 ++++---- 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index bcfc4d2e..551f43c6 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -128,7 +128,7 @@ void KGVDocument::doOpenFile() || _mimetype == "application/x-pdf" ) // see bug:67474 { _tmpDSC = new KTempFile( TQString(), ".ps" ); - Q_CHECK_PTR( _tmpDSC ); + TQ_CHECK_PTR( _tmpDSC ); if( _tmpDSC->status() != 0 ) { KMessageBox::error( _part->widget(), i18n( "Could not create temporary file: %1" ) @@ -196,7 +196,7 @@ bool KGVDocument::uncompressFile() } _tmpUnzipped = new KTempFile; - Q_CHECK_PTR( _tmpUnzipped ); + TQ_CHECK_PTR( _tmpUnzipped ); if( _tmpUnzipped->status() != 0 ) { KMessageBox::error( _part->widget(), diff --git a/kiconedit/kiconeditslots.cpp b/kiconedit/kiconeditslots.cpp index 7d8fffd7..e6b8fe67 100644 --- a/kiconedit/kiconeditslots.cpp +++ b/kiconedit/kiconeditslots.cpp @@ -71,7 +71,7 @@ void KIconEdit::slotNewWin(const TQString & url) //kdDebug(4640) << "KIconEdit::openNewWin() - " << url << endl; KIconEdit *w = new KIconEdit(KURL(url), "kiconedit"); - Q_CHECK_PTR(w); + TQ_CHECK_PTR(w); } diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp index 5f5d9387..686238a0 100644 --- a/kiconedit/kicongrid.cpp +++ b/kiconedit/kicongrid.cpp @@ -79,10 +79,10 @@ KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent, KIconEditProperties *props = KIconEditProperties::self(); viewport = new TQScrollView(this); - Q_CHECK_PTR(viewport); + TQ_CHECK_PTR(viewport); _grid = new KIconEditGrid(image, history, viewport->viewport()); - Q_CHECK_PTR(_grid); + TQ_CHECK_PTR(_grid); viewport->addChild(_grid); _grid->setGrid(props->showGrid()); _grid->setCellSize(props->gridScale()); @@ -1372,7 +1372,7 @@ void KIconEditGrid::editPasteAsNew() if(isModified()) { KIconEdit *w = new KIconEdit(tmp); - Q_CHECK_PTR(w); + TQ_CHECK_PTR(w); } else { diff --git a/kiconedit/main.cpp b/kiconedit/main.cpp index 52abdd09..2e0b82f2 100644 --- a/kiconedit/main.cpp +++ b/kiconedit/main.cpp @@ -71,13 +71,13 @@ int main(int argc, char **argv) for(int i = 0; i < args->count(); i++) { KIconEdit *ki = new KIconEdit(args->url(i), "kiconedit"); - Q_CHECK_PTR(ki); + TQ_CHECK_PTR(ki); } if (args->count() == 0) { KIconEdit *ki = new KIconEdit; - Q_CHECK_PTR(ki); + TQ_CHECK_PTR(ki); } args->clear(); } diff --git a/kiconedit/utils.cpp b/kiconedit/utils.cpp index e5748ffe..375fa946 100644 --- a/kiconedit/utils.cpp +++ b/kiconedit/utils.cpp @@ -37,7 +37,7 @@ void setupImageHandlers() kdDebug(4640) << "Initializing formats" << endl; formats = new imageFormats; - Q_CHECK_PTR(formats); + TQ_CHECK_PTR(formats); formats->setAutoDelete(true); formats->append(new imageFormat("GIF", "GIF", "gif")); #ifdef HAVE_LIBJPEG diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index 24cb2324..7132339c 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -69,15 +69,15 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name // TQFrame *page = addPage( TQString( "Save the image") ); TQFrame *page = new TQFrame( this ); page->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); - Q_CHECK_PTR( page ); + TQ_CHECK_PTR( page ); setMainWidget( page ); TQVBoxLayout *bigdad = new TQVBoxLayout( page, marginHint(), spacingHint()); - Q_CHECK_PTR(bigdad); + TQ_CHECK_PTR(bigdad); // some nice words TQLabel *l0 = new TQLabel( page ); - Q_CHECK_PTR(l0); + TQ_CHECK_PTR(l0); l0->setText( i18n( "Save Assistant

Select an image format to save the scanned image." )); bigdad->addWidget( l0 ); @@ -87,19 +87,19 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name // Layout-Boxes // TQHBoxLayout *hl1= new TQHBoxLayout( ); // Caption TQHBoxLayout *lhBigMiddle = new TQHBoxLayout( spacingHint() ); // Big middle - Q_CHECK_PTR(lhBigMiddle); + TQ_CHECK_PTR(lhBigMiddle); bigdad->addLayout( lhBigMiddle ); TQVBoxLayout *lvFormatSel = new TQVBoxLayout( spacingHint() ); // Selection List - Q_CHECK_PTR(lvFormatSel); + TQ_CHECK_PTR(lvFormatSel); lhBigMiddle->addLayout( lvFormatSel ); // Insert Scrolled List for formats TQLabel *l1 = new TQLabel( page ); - Q_CHECK_PTR(l1); + TQ_CHECK_PTR(l1); l1->setText( i18n( "Available image formats:" )); lb_format = new TQListBox( page, "ListBoxFormats" ); - Q_CHECK_PTR(lb_format); + TQ_CHECK_PTR(lb_format); #ifdef USE_KIMAGEIO TQStringList fo = KImageIO::types(); @@ -113,7 +113,7 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name // Insert label for helptext l_help = new TQLabel( page ); - Q_CHECK_PTR(l_help); + TQ_CHECK_PTR(l_help); l_help->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); l_help->setText( i18n("-No format selected-" )); l_help->setAlignment( AlignVCenter | AlignHCenter ); @@ -121,18 +121,18 @@ FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name // Insert Selbox for subformat l2 = new TQLabel( page ); - Q_CHECK_PTR(l2); + TQ_CHECK_PTR(l2); l2->setText( i18n( "Select the image sub-format" )); cb_subf = new TQComboBox( page, "ComboSubFormat" ); - Q_CHECK_PTR( cb_subf ); + TQ_CHECK_PTR( cb_subf ); // Checkbox to store setting cbDontAsk = new TQCheckBox(i18n("Don't ask again for the save format if it is defined."), page ); - Q_CHECK_PTR( cbDontAsk ); + TQ_CHECK_PTR( cbDontAsk ); TQFrame *hl = new TQFrame(page); - Q_CHECK_PTR( hl ); + TQ_CHECK_PTR( hl ); hl->setFrameStyle( TQFrame::HLine|TQFrame::Sunken ); // bigdad->addWidget( l_caption, 1 ); @@ -553,7 +553,7 @@ bool ImgSaver::isRememberedFormat( picType type, TQString format ) const TQString ImgSaver::getFormatForType( picType type ) const { KConfig *konf = KGlobal::config (); - Q_CHECK_PTR( konf ); + TQ_CHECK_PTR( konf ); konf->setGroup( OP_FILE_GROUP ); TQString f; @@ -583,7 +583,7 @@ TQString ImgSaver::getFormatForType( picType type ) const void ImgSaver::storeFormatForType( picType type, TQString format, bool ask ) { KConfig *konf = KGlobal::config (); - Q_CHECK_PTR( konf ); + TQ_CHECK_PTR( konf ); konf->setGroup( OP_FILE_GROUP ); konf->writeEntry( OP_FILE_ASK_FORMAT, ask ); @@ -692,7 +692,7 @@ void ImgSaver::readConfig( void ) { KConfig *konf = KGlobal::config (); - Q_CHECK_PTR( konf ); + TQ_CHECK_PTR( konf ); konf->setGroup( OP_FILE_GROUP ); ask_for_format = konf->readBoolEntry( OP_FILE_ASK_FORMAT, true ); diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp index ca913f1d..0f879124 100644 --- a/kooka/kocrgocr.cpp +++ b/kooka/kocrgocr.cpp @@ -91,7 +91,7 @@ EngineError KGOCRDialog::setupGui() KOCRBase::setupGui(); TQVBox *page = ocrPage(); - Q_CHECK_PTR( page ); + TQ_CHECK_PTR( page ); KConfig *conf = KGlobal::config (); conf->setGroup( CFG_GROUP_OCR_DIA ); diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 5e4ec654..3fed9b2a 100644 --- a/kooka/kocrkadmos.cpp +++ b/kooka/kocrkadmos.cpp @@ -299,7 +299,7 @@ EngineError KadmosDialog::setupGui() innerBox->setSpacing( KDialog::spacingHint()); TQButtonGroup *cbGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("OCR Modifier"), innerBox ); - Q_CHECK_PTR(cbGroup); + TQ_CHECK_PTR(cbGroup); m_cbNoise = new TQCheckBox( i18n( "Enable automatic noise reduction" ), cbGroup ); m_cbAutoscale = new TQCheckBox( i18n( "Enable automatic scaling"), cbGroup ); diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp index 86796341..00bfb47b 100644 --- a/kooka/kocrocrad.cpp +++ b/kooka/kocrocrad.cpp @@ -102,7 +102,7 @@ EngineError ocradDialog::setupGui() KOCRBase::setupGui(); TQVBox *page = ocrPage(); - Q_CHECK_PTR( page ); + TQ_CHECK_PTR( page ); KConfig *conf = KGlobal::config (); conf->setGroup( CFG_GROUP_OCR_DIA ); diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index bb115ef1..85a29d60 100644 --- a/kooka/kookaview.cpp +++ b/kooka/kookaview.cpp @@ -192,7 +192,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU m_dockScanParam->setWidget( 0 ); // later sane = new KScanDevice( TQT_TQOBJECT(m_dockScanParam) ); - Q_CHECK_PTR(sane); + TQ_CHECK_PTR(sane); m_dockScanParam->manualDock( m_dockRecent, // dock target KDockWidget::DockBottom, // dock site @@ -342,7 +342,7 @@ bool KookaView::slSelectDevice( const TQCString& useDevice ) /* This connects to the selected scanner */ scan_params = new ScanParams( m_dockScanParam ); - Q_CHECK_PTR(scan_params); + TQ_CHECK_PTR(scan_params); if( sane->openDevice( selDevice ) == KSCAN_OK ) { @@ -587,7 +587,7 @@ void KookaView::startOCR( KookaImage *img ) } - Q_CHECK_PTR( ocrFabric ); + TQ_CHECK_PTR( ocrFabric ); ocrFabric->slSetImage( img ); if( !ocrFabric->startOCRVisible(m_mainDock) ) diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 70878549..f22d83fd 100644 --- a/kooka/ksaneocr.cpp +++ b/kooka/ksaneocr.cpp @@ -394,7 +394,7 @@ void KSANEOCR::startOCRAD( ) } daemon = new KProcess; - Q_CHECK_PTR(daemon); + TQ_CHECK_PTR(daemon); *daemon << cmd; *daemon << TQString("-x"); @@ -532,7 +532,7 @@ void KSANEOCR::startOCRProcess( void ) } daemon = new KProcess; - Q_CHECK_PTR(daemon); + TQ_CHECK_PTR(daemon); m_ocrResultText = ""; connect(daemon, TQT_SIGNAL(processExited(KProcess *)), diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index 2f5da3ca..a54fde7c 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -152,7 +152,7 @@ KFileTreeBranch* ScanPackager::openRoot( const KURL& root, bool ) loader->loadIcon( "folder_image", KIcon::Small ), false /* do not showHidden */ ); - // Q_CHECK_PTR( m_defaultBranch ); + // TQ_CHECK_PTR( m_defaultBranch ); m_defaultBranch->setOpenPixmap( loader->loadIcon( "folder_blue_open", KIcon::Small )); setDirOnlyMode( m_defaultBranch, false ); 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.1