diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2025-03-28 18:11:49 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2025-04-03 19:23:45 +0900 |
commit | 0bd9d5459891e6fb17ee6802878f85e217cb9f54 (patch) | |
tree | 962f6ea26d1fab041fe3476fbbd64132ab8ada1b /kpresenter | |
parent | cb258b7e39ffa5662b57e7d9006e69172a378d7e (diff) | |
download | koffice-r14.1.4.tar.gz koffice-r14.1.4.zip |
Replace TRUE/FALSE with boolean values true/falser14.1.4
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit cf85b9c285a2b9baa87c9d0cb9d683b48e82a475)
Diffstat (limited to 'kpresenter')
-rw-r--r-- | kpresenter/KPrAutoformObject.h | 2 | ||||
-rw-r--r-- | kpresenter/KPrCanvas.cpp | 20 | ||||
-rw-r--r-- | kpresenter/KPrDocument.cpp | 14 | ||||
-rw-r--r-- | kpresenter/KPrEllipseObject.h | 2 | ||||
-rw-r--r-- | kpresenter/KPrGroupObject.h | 2 | ||||
-rw-r--r-- | kpresenter/KPrImportStyleDia.cpp | 2 | ||||
-rw-r--r-- | kpresenter/KPrLineObject.h | 2 | ||||
-rw-r--r-- | kpresenter/KPrMoveHelpLineDia.cpp | 2 | ||||
-rw-r--r-- | kpresenter/KPrObject.h | 8 | ||||
-rw-r--r-- | kpresenter/KPrPartObject.h | 4 | ||||
-rw-r--r-- | kpresenter/KPrPixmapObject.h | 2 | ||||
-rw-r--r-- | kpresenter/KPrPointObject.h | 2 | ||||
-rw-r--r-- | kpresenter/KPrSideBar.cpp | 4 | ||||
-rw-r--r-- | kpresenter/KPrTextObject.cpp | 2 | ||||
-rw-r--r-- | kpresenter/KPrView.cpp | 40 | ||||
-rw-r--r-- | kpresenter/KoPointArray.cpp | 6 |
16 files changed, 57 insertions, 57 deletions
diff --git a/kpresenter/KPrAutoformObject.h b/kpresenter/KPrAutoformObject.h index 863ae7d8d..89336ce14 100644 --- a/kpresenter/KPrAutoformObject.h +++ b/kpresenter/KPrAutoformObject.h @@ -71,7 +71,7 @@ protected: virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; virtual void paint( TQPainter *_painter, KoTextZoomHandler *_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); TQString filename; diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index ab8e15434..3e552bfc4 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -211,7 +211,7 @@ void KPrCanvas::scrollY( int y ) bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e ) { if ( !o || !e ) - return TRUE; + return true; if ( m_currentTextObjectView ) KCursor::autoHideEventFilter( o, e ); switch ( e->type() ) @@ -219,11 +219,11 @@ bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e ) case TQEvent::FocusIn: if ( m_currentTextObjectView ) m_currentTextObjectView->focusInEvent(); - return TRUE; + return true; case TQEvent::FocusOut: if ( m_currentTextObjectView ) m_currentTextObjectView->focusOutEvent(); - return TRUE; + return true; case TQEvent::KeyPress: { TQKeyEvent * keyev = static_cast<TQKeyEvent*>(e); @@ -277,7 +277,7 @@ bool KPrCanvas::eventFilter( TQObject *o, TQEvent *e ) bool KPrCanvas::focusNextPrevChild( bool ) { - return TRUE; // Don't allow to go out of the canvas widget by pressing "Tab" + return true; // Don't allow to go out of the canvas widget by pressing "Tab" } void KPrCanvas::paintEvent( TQPaintEvent* paintEvent ) @@ -1173,7 +1173,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) switch ( toolEditMode ) { case TEM_MOUSE: { - drawContour = FALSE; + drawContour = false; switch ( modType ) { case MT_NONE: { if ( drawRubber ) { @@ -1259,7 +1259,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) } break; case TEM_ZOOM:{ - drawContour = FALSE; + drawContour = false; if( modType == MT_NONE && drawRubber ) { TQPainter p; @@ -1283,7 +1283,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e ) } }break; case TEM_ROTATE: { - drawContour = FALSE; + drawContour = false; if ( !m_rotateObject ) break; if ( m_angleBeforeRotate != m_rotateObject->getAngle() ) { @@ -1465,7 +1465,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) } else if ( mousePressed ) { switch ( toolEditMode ) { case TEM_MOUSE: { - drawContour = TRUE; + drawContour = true; if ( modType == MT_NONE ) { if ( drawRubber ) { @@ -1528,7 +1528,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e ) case TEM_ROTATE: { if ( m_rotateObject ) { - drawContour = TRUE; + drawContour = true; // angle to mouse pos double angle = KoPoint::getAngle( m_rotateCenter, docPoint ); // angle to start of mouse pos @@ -4472,7 +4472,7 @@ void KPrCanvas::setTextBackground( KPrTextObject */*obj*/ ) #if 0 TQPixmap pix( m_activePage->getZoomPageRect().size() ); TQPainter painter( &pix ); - m_activePage->background()->drawBackground( &painter, FALSE ); + m_activePage->background()->drawBackground( &painter, false ); TQPixmap bpix( obj->getSize().toTQSize() ); // ## zoom it ! bitBlt( &bpix, 0, 0, &pix, obj->getOrig().x(), obj->getOrig().y() - m_activePage->getZoomPageRect().height() * ( m_view->getCurrPgNum() - 1 ), bpix.width(), bpix.height() ); diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp index 9540771cc..97c9a894c 100644 --- a/kpresenter/KPrDocument.cpp +++ b/kpresenter/KPrDocument.cpp @@ -257,7 +257,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje objStartY = 0; _presPen = TQPen( red, 3, SolidLine ); - ignoreSticky = TRUE; + ignoreSticky = true; m_gridColor=TQt::black; @@ -1567,7 +1567,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles TQTime dt; dt.start(); m_loadingInfo = new KPrLoadingInfo; - ignoreSticky = FALSE; + ignoreSticky = false; emit sigProgress( 0 ); lastObj = -1; @@ -1772,7 +1772,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles if (!settings.isNull() && _clean /*don't load settings when we copy/paste a page*/) loadOasisPresentationSettings( settings ); - ignoreSticky = TRUE; + ignoreSticky = true; kdDebug()<<" _clean :"<<_clean<<endl; if(_clean) { @@ -2201,7 +2201,7 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc ) dt.start(); m_loadingInfo = new KPrLoadingInfo( true ); - ignoreSticky = FALSE; + ignoreSticky = false; bool b=false; TQDomElement docelem = doc.documentElement(); const int syntaxVersion = docelem.attribute( "syntaxVersion" ).toInt(); @@ -2254,7 +2254,7 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc ) else b = loadXML( doc ); - ignoreSticky = TRUE; + ignoreSticky = true; if(_clean) { @@ -2624,7 +2624,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc ) } } else if(elem.tagName()=="PRESSLIDES") { if(elem.hasAttribute("value") && elem.attribute("value").toInt()==0) - allSlides = TRUE; + allSlides = true; } else if ( elem.tagName()=="DEFAULTCUSTOMSLIDESHOWNAME" ) { if(elem.hasAttribute("name") ) m_presentationName=elem.attribute( "name" ); @@ -3972,7 +3972,7 @@ void KPrDocument::pastePage( const TQMimeSource * data, int pgnum ) KURL::List lst; if ( KURLDrag::decode( data, lst ) && !lst.isEmpty() ) { - insertNewPage(i18n("Paste Slide"), pgnum, IP_BEFORE, FALSE, lst.first().path() ); + insertNewPage(i18n("Paste Slide"), pgnum, IP_BEFORE, false, lst.first().path() ); //selectPage( pgnum, true /* should be part of the file ? */ ); } } diff --git a/kpresenter/KPrEllipseObject.h b/kpresenter/KPrEllipseObject.h index 33afd6095..f0c559de1 100644 --- a/kpresenter/KPrEllipseObject.h +++ b/kpresenter/KPrEllipseObject.h @@ -56,7 +56,7 @@ protected: virtual bool saveOasisObjectAttributes( KPOasisSaveContext &sc ) const; virtual void paint( TQPainter *_painter,KoTextZoomHandler *_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); }; diff --git a/kpresenter/KPrGroupObject.h b/kpresenter/KPrGroupObject.h index 4237c60e9..6204ea7b1 100644 --- a/kpresenter/KPrGroupObject.h +++ b/kpresenter/KPrGroupObject.h @@ -72,7 +72,7 @@ public: virtual void loadOasisGroupObject( KPrDocument *doc, KPrPage * newpage, TQDomNode &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, - int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); + int pageNum, SelectionMode selectionMode, bool drawContour = false ); void addObjects( KPrObject * obj ); diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp index 228e80bde..f9848847e 100644 --- a/kpresenter/KPrImportStyleDia.cpp +++ b/kpresenter/KPrImportStyleDia.cpp @@ -46,7 +46,7 @@ KPrImportStyleDia::~KPrImportStyleDia() void KPrImportStyleDia::loadFile() { - KFileDialog fd( TQString(), TQString(), 0, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), 0, 0, true ); TQStringList lst = "application/x-kpresenter"; #if 0 //For the future lst << "application/vnd.oasis.opendocument.presentation"; diff --git a/kpresenter/KPrLineObject.h b/kpresenter/KPrLineObject.h index 6998449c4..eca3c9f0b 100644 --- a/kpresenter/KPrLineObject.h +++ b/kpresenter/KPrLineObject.h @@ -76,7 +76,7 @@ protected: virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; virtual void paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); LineType lineType; }; diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp index 0fd25e521..2bb6683fc 100644 --- a/kpresenter/KPrMoveHelpLineDia.cpp +++ b/kpresenter/KPrMoveHelpLineDia.cpp @@ -72,7 +72,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa setCaption( i18n("Add New Help Line") ); TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *group = new TQButtonGroup( 1, TQt::Horizontal,i18n("Orientation"), page ); - group->setRadioButtonExclusive( TRUE ); + group->setRadioButtonExclusive( true ); group->layout(); m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group ); m_rbVert = new TQRadioButton( i18n("Vertical"), group ); diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h index f5dce5349..d34284b28 100644 --- a/kpresenter/KPrObject.h +++ b/kpresenter/KPrObject.h @@ -239,7 +239,7 @@ public: // the main drawing method. virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int /*pageNum*/, SelectionMode selectionMode, bool drawContour = FALSE ); + int /*pageNum*/, SelectionMode selectionMode, bool drawContour = false ); /** * @brief Check if point lies in rect of object @@ -420,7 +420,7 @@ public: virtual double load(const TQDomElement &element); virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); + int pageNum, SelectionMode selectionMode, bool drawContour = false ); virtual void saveOasisStrokeElement( KoGenStyles& mainStyles, KoGenStyle &styleobjectauto ) const; TQString saveOasisStrokeStyle( KoGenStyles& mainStyles ) const; @@ -471,7 +471,7 @@ protected: * This method isn't pure virtual because some objects implement draw() directly. */ virtual void paint( TQPainter* /* painter */, KoTextZoomHandler* /* zoomHandler */, - int /* pageNum */, bool drawingShadow, bool /* drawContour */ = FALSE ); + int /* pageNum */, bool drawingShadow, bool /* drawContour */ = false ); KoPen pen; }; @@ -521,7 +521,7 @@ public: virtual double load(const TQDomElement &element); virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); + int pageNum, SelectionMode selectionMode, bool drawContour = false ); virtual void flip(bool horizontal ); diff --git a/kpresenter/KPrPartObject.h b/kpresenter/KPrPartObject.h index 1f4b48f83..98401814f 100644 --- a/kpresenter/KPrPartObject.h +++ b/kpresenter/KPrPartObject.h @@ -43,7 +43,7 @@ public: virtual TQString getTypeString() const { return i18n("Embedded Object"); } virtual void draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler, - int pageNum, SelectionMode selectionMode, bool drawContour = FALSE ); + int pageNum, SelectionMode selectionMode, bool drawContour = false ); void activate( TQWidget *_widget ); void deactivate(); @@ -61,7 +61,7 @@ protected: void updateChildGeometry(); virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); bool _enableDrawing; KPrChild *child; diff --git a/kpresenter/KPrPixmapObject.h b/kpresenter/KPrPixmapObject.h index 23917ef5b..8af906b24 100644 --- a/kpresenter/KPrPixmapObject.h +++ b/kpresenter/KPrPixmapObject.h @@ -76,7 +76,7 @@ public: virtual void loadOasis(const TQDomElement &element, KoOasisContext & context, KPrLoadingInfo *info); virtual void draw( TQPainter *_painter, KoTextZoomHandler*_zoomHandler, - int /* page */, SelectionMode selectionMode, bool drawContour = FALSE ); + int /* page */, SelectionMode selectionMode, bool drawContour = false ); TQPixmap getOriginalPixmap(); PictureMirrorType getPictureMirrorType() const { return mirrorType; } diff --git a/kpresenter/KPrPointObject.h b/kpresenter/KPrPointObject.h index a0039f551..e4464306c 100644 --- a/kpresenter/KPrPointObject.h +++ b/kpresenter/KPrPointObject.h @@ -63,7 +63,7 @@ protected: virtual void fillStyle( KoGenStyle& styleObjectAuto, KoGenStyles& mainStyles ) const; virtual void paint( TQPainter *_painter,KoTextZoomHandler*_zoomHandler, - int /* pageNum */, bool drawingShadow, bool drawContour = FALSE ); + int /* pageNum */, bool drawingShadow, bool drawContour = false ); virtual void updatePoints( double _fx, double _fy ); virtual KoPointArray getDrawingPoints() const; diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp index 9917f97d5..d3b6d7929 100644 --- a/kpresenter/KPrSideBar.cpp +++ b/kpresenter/KPrSideBar.cpp @@ -265,7 +265,7 @@ void KPrThumbBar::setCurrentPage( int pg ) if ( it->text().toInt() - 1 == pg ) { blockSignals( true ); setCurrentItem( it ); - setSelected( it, FALSE ); // to avoid the blue "selected"-mark + setSelected( it, false ); // to avoid the blue "selected"-mark ensureItemVisible(it); refreshItems(); blockSignals( false ); @@ -283,7 +283,7 @@ TQRect KPrThumbBar::tip(const TQPoint &pos, TQString &title) int pagenr = item->index(); title = m_doc->pageList().at(pagenr)->pageTitle(); - TQRect r = item->pixmapRect(FALSE); + TQRect r = item->pixmapRect(false); r = TQRect(contentsToViewport(TQPoint(r.x(), r.y())), TQSize(r.width(), r.height())); return r; } diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 18844e432..b160fd527 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -1402,7 +1402,7 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV TQMAX(0, iPoint.x() - 5), // negative values create problems iPoint.y(), clip.width(), clip.height(), pix, cg, m_doc->zoomHandler(), - cursorVisible, cursor, FALSE /*resetChanged*/, drawingFlags ); + cursorVisible, cursor, false /*resetChanged*/, drawingFlags ); if ( wasChanged ) // Maybe we have more changes to draw, than those in the small cliprect cursor->parag()->setLineChanged( oldLineChanged ); // -1 = all diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index bc89df188..9370233b0 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -441,7 +441,7 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) } - setAcceptDrops( TRUE ); + setAcceptDrops( true ); } DCOPObject* KPrView::dcopObject() @@ -717,15 +717,15 @@ void KPrView::editDelPage() void KPrView::insertPage() { - InsertPageDia dia( this, 0, TRUE ); + InsertPageDia dia( this, 0, true ); #if COPYOASISFORMAT TQString templ = locateLocal( "data", "kpresenter/default.oop" ); #else TQString templ = locateLocal( "data", "kpresenter/default.kpr" ); #endif if ( !TQFile::exists( templ ) ) { - dia.radioDifferent->setChecked( TRUE ); - dia.radioDefault->setEnabled( FALSE ); + dia.radioDifferent->setChecked( true ); + dia.radioDefault->setEnabled( false ); } if ( dia.exec() != TQDialog::Accepted ) return; @@ -808,7 +808,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) TQStringList mimetypes; mimetypes << mimetype; - KFileDialog fd( oldFile, TQString(), this, 0, TRUE ); + KFileDialog fd( oldFile, TQString(), this, 0, true ); fd.setMimeFilter( mimetypes ); fd.setCaption(i18n("Save Picture")); fd.setOperationMode(KFileDialog::Saving); @@ -1572,7 +1572,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) vert->setEnabled( false ); horz->setEnabled( false ); m_bShowGUI = false; - m_canvas->reparent( ( TQWidget* )0L, 0, TQPoint( 0, 0 ), FALSE ); + m_canvas->reparent( ( TQWidget* )0L, 0, TQPoint( 0, 0 ), false ); m_canvas->setPaletteBackgroundColor( TQt::white ); m_canvas->showFullScreen(); m_canvas->setFocusPolicy( TQWidget::StrongFocus ); @@ -2230,7 +2230,7 @@ void KPrView::createGUI() if ( sidebar ) { sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() ); - sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE ); + sidebar->outline()->setSelected( sidebar->outline()->firstChild(), true ); TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); if(!config->readBoolEntry("Sidebar", true)) { @@ -3756,12 +3756,12 @@ void KPrView::setupScrollbars() horz->setValue(horz->minValue()); pgNext = new TQToolButton( pageBase ); pgNext->setPixmap( TQPixmap( pagedown_xpm ) ); - pgNext->setAutoRepeat( TRUE ); + pgNext->setAutoRepeat( true ); TQToolTip::add( pgNext, i18n( "Next slide" ) ); connect( pgNext, TQ_SIGNAL( clicked() ), this, TQ_SLOT( nextPage() ) ); pgPrev = new TQToolButton( pageBase ); pgPrev->setPixmap( TQPixmap( pageup_xpm ) ); - pgPrev->setAutoRepeat( TRUE ); + pgPrev->setAutoRepeat( true ); TQToolTip::add( pgPrev, i18n( "Previous slide" ) ); connect( pgPrev, TQ_SIGNAL( clicked() ), this, TQ_SLOT( prevPage() ) ); } @@ -3847,7 +3847,7 @@ void KPrView::skipToPage( int num ) //(Laurent) deselect object when we change page. //otherwise you can change object properties on other page deSelectAllObjects(); - m_pKPresenterDoc->repaint( FALSE ); + m_pKPresenterDoc->repaint( false ); m_pKPresenterDoc->displayActivePage( page ); } @@ -4053,11 +4053,11 @@ void KPrView::updateSideBar() { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->thumbBar()->uptodate = false; sidebar->outline()->rebuildItems(); sidebar->thumbBar()->rebuildItems(); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4072,9 +4072,9 @@ void KPrView::addSideBarItem( int pos ) { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->addItem( pos ); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4082,9 +4082,9 @@ void KPrView::moveSideBarItem( int oldPos, int newPos ) { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->moveItem( oldPos, newPos ); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4092,9 +4092,9 @@ void KPrView::removeSideBarItem( int pos ) { if ( sidebar ) { - sidebar->blockSignals( TRUE ); + sidebar->blockSignals( true ); sidebar->removeItem( pos ); - sidebar->blockSignals( FALSE ); + sidebar->blockSignals( false ); } } @@ -4627,7 +4627,7 @@ void KPrView::spellCheckerRemoveHighlight() } KPrTextView *edit=m_canvas->currentTextObjectView(); if (edit) - edit->drawCursor( TRUE ); + edit->drawCursor( true ); } @@ -6149,7 +6149,7 @@ void KPrView::autoSpellCheck() void KPrView::insertFile( ) { - KFileDialog fd( TQString(), TQString(), this, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), this, 0, true ); TQStringList filter; filter<<"application/x-kpresenter"; filter<<"application/vnd.oasis.opendocument.presentation"; diff --git a/kpresenter/KoPointArray.cpp b/kpresenter/KoPointArray.cpp index 6a347ca26..30e34ecb5 100644 --- a/kpresenter/KoPointArray.cpp +++ b/kpresenter/KoPointArray.cpp @@ -60,10 +60,10 @@ bool KoPointArray::putPoints( int index, int nPoints, double firstx, double firs va_list ap; if ( index + nPoints > (int)size() ) { // extend array if ( !resize(index + nPoints) ) - return FALSE; + return false; } if ( nPoints <= 0 ) - return TRUE; + return true; setPoint( index, firstx, firsty ); // set first point int i = index + 1; double x, y; @@ -75,7 +75,7 @@ bool KoPointArray::putPoints( int index, int nPoints, double firstx, double firs setPoint( i++, x, y ); } va_end( ap ); - return TRUE; + return true; } void split(const double *p, double *l, double *r) |