Recently I reported that tdegraphics failed to build against TQt3 but built without error against Qt3.
I patched tdegraphics and now can build tdegraphics against both.
Although the patch works I'm uncomfortable pushing to GIT without peer review. I would appreciate somebody else reviewing and committing the patch.
Here is the patch:
======================================================= diff -urN tdegraphics/kghostview/kgvdocument.cpp tdegraphics.new/kghostview/kgvdocument.cpp --- tdegraphics/kghostview/kgvdocument.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kghostview/kgvdocument.cpp 2012-02-20 22:17:01.000000000 -0600 @@ -128,7 +128,7 @@ || _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 @@ }
_tmpUnzipped = new KTempFile; - Q_CHECK_PTR( _tmpUnzipped ); + TQ_CHECK_PTR( _tmpUnzipped ); if( _tmpUnzipped->status() != 0 ) { KMessageBox::error( _part->widget(), diff -urN tdegraphics/kiconedit/kiconeditslots.cpp tdegraphics.new/kiconedit/kiconeditslots.cpp --- tdegraphics/kiconedit/kiconeditslots.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kiconedit/kiconeditslots.cpp 2012-02-20 22:17:03.000000000 -0600 @@ -71,7 +71,7 @@ //kdDebug(4640) << "KIconEdit::openNewWin() - " << url << endl;
KIconEdit *w = new KIconEdit(KURL(url), "kiconedit"); - Q_CHECK_PTR(w); + TQ_CHECK_PTR(w); }
diff -urN tdegraphics/kiconedit/kicongrid.cpp tdegraphics.new/kiconedit/kicongrid.cpp --- tdegraphics/kiconedit/kicongrid.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kiconedit/kicongrid.cpp 2012-02-20 22:17:03.000000000 -0600 @@ -79,10 +79,10 @@ 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 @@ if(isModified()) { KIconEdit *w = new KIconEdit(tmp); - Q_CHECK_PTR(w); + TQ_CHECK_PTR(w); } else { diff -urN tdegraphics/kiconedit/main.cpp tdegraphics.new/kiconedit/main.cpp --- tdegraphics/kiconedit/main.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kiconedit/main.cpp 2012-02-20 22:17:03.000000000 -0600 @@ -71,13 +71,13 @@ 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 -urN tdegraphics/kiconedit/utils.cpp tdegraphics.new/kiconedit/utils.cpp --- tdegraphics/kiconedit/utils.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kiconedit/utils.cpp 2012-02-20 22:17:03.000000000 -0600 @@ -37,7 +37,7 @@
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 -urN tdegraphics/kooka/img_saver.cpp tdegraphics.new/kooka/img_saver.cpp --- tdegraphics/kooka/img_saver.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kooka/img_saver.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -69,15 +69,15 @@ // 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( "<B>Save Assistant</B><P>Select an image format to save the scanned image." )); bigdad->addWidget( l0 );
@@ -87,19 +87,19 @@ // 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 @@
// 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 @@
// 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 @@ 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 @@ 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 @@ {
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 -urN tdegraphics/kooka/kocrgocr.cpp tdegraphics.new/kooka/kocrgocr.cpp --- tdegraphics/kooka/kocrgocr.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kooka/kocrgocr.cpp 2012-02-20 22:17:10.000000000 -0600 @@ -91,7 +91,7 @@ KOCRBase::setupGui();
TQVBox *page = ocrPage(); - Q_CHECK_PTR( page ); + TQ_CHECK_PTR( page );
KConfig *conf = KGlobal::config (); conf->setGroup( CFG_GROUP_OCR_DIA ); diff -urN tdegraphics/kooka/kocrkadmos.cpp tdegraphics.new/kooka/kocrkadmos.cpp --- tdegraphics/kooka/kocrkadmos.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kooka/kocrkadmos.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -299,7 +299,7 @@ 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 -urN tdegraphics/kooka/kocrocrad.cpp tdegraphics.new/kooka/kocrocrad.cpp --- tdegraphics/kooka/kocrocrad.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kooka/kocrocrad.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -102,7 +102,7 @@ KOCRBase::setupGui();
TQVBox *page = ocrPage(); - Q_CHECK_PTR( page ); + TQ_CHECK_PTR( page );
KConfig *conf = KGlobal::config (); conf->setGroup( CFG_GROUP_OCR_DIA ); diff -urN tdegraphics/kooka/kookaview.cpp tdegraphics.new/kooka/kookaview.cpp --- tdegraphics/kooka/kookaview.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kooka/kookaview.cpp 2012-02-20 22:17:10.000000000 -0600 @@ -192,7 +192,7 @@
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 @@
/* 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 @@
}
- Q_CHECK_PTR( ocrFabric ); + TQ_CHECK_PTR( ocrFabric ); ocrFabric->slSetImage( img );
if( !ocrFabric->startOCRVisible(m_mainDock) ) diff -urN tdegraphics/kooka/ksaneocr.cpp tdegraphics.new/kooka/ksaneocr.cpp --- tdegraphics/kooka/ksaneocr.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kooka/ksaneocr.cpp 2012-02-20 22:17:10.000000000 -0600 @@ -394,7 +394,7 @@ }
daemon = new KProcess; - Q_CHECK_PTR(daemon); + TQ_CHECK_PTR(daemon);
*daemon << cmd; *daemon << TQString("-x"); @@ -532,7 +532,7 @@ }
daemon = new KProcess; - Q_CHECK_PTR(daemon); + TQ_CHECK_PTR(daemon); m_ocrResultText = "";
connect(daemon, TQT_SIGNAL(processExited(KProcess *)), diff -urN tdegraphics/kooka/scanpackager.cpp tdegraphics.new/kooka/scanpackager.cpp --- tdegraphics/kooka/scanpackager.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/kooka/scanpackager.cpp 2012-02-20 22:17:10.000000000 -0600 @@ -152,7 +152,7 @@ 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 -urN tdegraphics/libkscan/devselector.cpp tdegraphics.new/libkscan/devselector.cpp --- tdegraphics/libkscan/devselector.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/libkscan/devselector.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -49,19 +49,19 @@ 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 -urN tdegraphics/libkscan/gammadialog.cpp tdegraphics.new/libkscan/gammadialog.cpp --- tdegraphics/libkscan/gammadialog.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/libkscan/gammadialog.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -36,7 +36,7 @@ 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 @@
/* 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 -urN tdegraphics/libkscan/imgscaledialog.cpp tdegraphics.new/libkscan/imgscaledialog.cpp --- tdegraphics/libkscan/imgscaledialog.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/libkscan/imgscaledialog.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -42,7 +42,7 @@ // 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 -urN tdegraphics/libkscan/scandialog.cpp tdegraphics.new/libkscan/scandialog.cpp --- tdegraphics/libkscan/scandialog.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/libkscan/scandialog.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -75,7 +75,7 @@ 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 @@ 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 @@ 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 @@
TQWidget *spaceEater = new TQWidget( page ); - Q_CHECK_PTR( spaceEater ); + TQ_CHECK_PTR( spaceEater ); spaceEater->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
} diff -urN tdegraphics/libkscan/scanparams.cpp tdegraphics.new/libkscan/scanparams.cpp --- tdegraphics/libkscan/scanparams.cpp 2011-12-25 01:04:04.000000000 -0600 +++ tdegraphics.new/libkscan/scanparams.cpp 2012-02-20 22:17:09.000000000 -0600 @@ -139,7 +139,7 @@
/* 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 @@ /* 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 @@ (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 @@ 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 ) =======================================================
Thanks.
Darrell