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 --- 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 +- 7 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kooka') 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 ); -- cgit v1.2.1