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 /kword | |
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 'kword')
-rw-r--r-- | kword/KWAnchor.cpp | 4 | ||||
-rw-r--r-- | kword/KWCanvas.cpp | 34 | ||||
-rw-r--r-- | kword/KWCommand.cpp | 8 | ||||
-rw-r--r-- | kword/KWDocument.cpp | 20 | ||||
-rw-r--r-- | kword/KWFrameDia.cpp | 2 | ||||
-rw-r--r-- | kword/KWFrameSet.h | 2 | ||||
-rw-r--r-- | kword/KWImportStyleDia.cpp | 4 | ||||
-rw-r--r-- | kword/KWInsertPageDia.cpp | 6 | ||||
-rw-r--r-- | kword/KWInsertPicDia.cpp | 2 | ||||
-rw-r--r-- | kword/KWSortDia.cpp | 6 | ||||
-rw-r--r-- | kword/KWTableDia.cpp | 4 | ||||
-rw-r--r-- | kword/KWTextDocument.h | 2 | ||||
-rw-r--r-- | kword/KWTextFrameSet.cpp | 6 | ||||
-rw-r--r-- | kword/KWTextParag.cpp | 2 | ||||
-rw-r--r-- | kword/KWTextParag.h | 2 | ||||
-rw-r--r-- | kword/KWView.cpp | 58 | ||||
-rw-r--r-- | kword/mailmerge/KWClassicSerialDataSource.cpp | 4 | ||||
-rw-r--r-- | kword/mailmerge/KWClassicSerialDataSource.h | 2 | ||||
-rw-r--r-- | kword/mailmerge/sql/KWMySqlCursor.h | 14 |
19 files changed, 91 insertions, 91 deletions
diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp index a291999e1..5b83efc3c 100644 --- a/kword/KWAnchor.cpp +++ b/kword/KWAnchor.cpp @@ -298,9 +298,9 @@ void KWAnchor::saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const bool KWAnchor::ownLine() const { if ( m_deleted ) - return FALSE; + return false; if ( m_frameset) return m_frameset->ownLine(); - return FALSE; + return false; } diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index e006903cd..2de097a5f 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -105,10 +105,10 @@ KWCanvas::KWCanvas(const TQString& viewMode, TQWidget *parent, KWDocument *d, KW m_temporaryStatusBarTextShown = false; viewport()->setBackgroundMode( PaletteBase ); - viewport()->setAcceptDrops( TRUE ); + viewport()->setAcceptDrops( true ); - setKeyCompression( TRUE ); - viewport()->setMouseTracking( TRUE ); + setKeyCompression( true ); + viewport()->setMouseTracking( true ); m_scrollTimer = new TQTimer( this ); connect( m_scrollTimer, TQ_SIGNAL( timeout() ), @@ -403,7 +403,7 @@ void KWCanvas::mpCreatePixmap( const TQPoint& normalPoint, bool noGrid ) } emit docStructChanged(Pictures); if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - repaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( false ); //draw the grid over the whole canvas } } @@ -812,7 +812,7 @@ void KWCanvas::contentsMouseMoveEvent( TQMouseEvent *e ) m_currentTable->resizeColumn( m_rowColResized, docPoint.x() ); // Repaint only the changed rects (oldRect U newRect) TQRect newRect( m_viewMode->normalToView( m_doc->zoomRect( m_currentTable->boundingRect() ) ) ); - repaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), FALSE ); + repaintContents( TQRegion(oldRect).unite(newRect).boundingRect(), false ); } else if (m_interactionPolicy) { m_interactionPolicy->handleMouseMove(e->state(), @@ -1127,7 +1127,7 @@ void KWCanvas::contentsMouseReleaseEvent( TQMouseEvent * e ) } if ( old_mouseMove != MM_EDIT && !m_doc->showGrid() && m_doc->snapToGrid() ) - repaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( false ); //draw the grid over the whole canvas m_mousePressed = false; } } @@ -1404,7 +1404,7 @@ void KWCanvas::setMouseMode( MouseMode newMouseMode ) m_mouseMode = newMouseMode; if ( !m_doc->showGrid() && m_doc->snapToGrid() ) - repaintContents( FALSE ); //draw the grid over the whole canvas + repaintContents( false ); //draw the grid over the whole canvas } else m_mouseMode = newMouseMode; @@ -1778,11 +1778,11 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) // Activate this code (and in focusNextPreviousChild() to allow Shift+Tab // out of document window. Disabled because it conflicts with Shift+Tab inside a table. // else if ( keyev->key() == TQt::Key_BackTab ) - // return FALSE; + // return false; else if ( keyev->key() == TDEGlobalSettings::contextMenuKey() ) { // The popups are not available in readonly mode, since the GUI isn't built... - if(!m_doc->isReadWrite()) return TRUE; - if (m_mouseMode != MM_EDIT) return TRUE; + if(!m_doc->isReadWrite()) return true; + if (m_mouseMode != MM_EDIT) return true; KoPoint docPoint = m_doc->unzoomPoint( TQCursor::pos() ); if ( viewMode()->type()=="ModeText") { @@ -1804,9 +1804,9 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) // around before they click or hit Enter. if (m_frameInline) m_lastCaretPos = caretPos(); - if (m_lastCaretPos.isNull()) return TRUE; + if (m_lastCaretPos.isNull()) return true; int page = m_doc->pageManager()->pageNumber(m_lastCaretPos); - if(page == -1) return TRUE; + if(page == -1) return true; TQPoint normalPoint = m_doc->zoomPoint(m_lastCaretPos); // Coordinate is at the very top of the caret. In the case of an // inline frame, adjust slightly down and to the right in order @@ -1862,7 +1862,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) } else m_currentFrameSetEdit->keyPressEvent( keyev ); - return TRUE; + return true; } // Because of the dependency on the control key, we need to update the mouse cursor here @@ -1891,7 +1891,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) if ( m_currentFrameSetEdit && m_mouseMode == MM_EDIT && m_doc->isReadWrite() && !m_printing ) { m_currentFrameSetEdit->keyReleaseEvent( keyev ); - return TRUE; + return true; } } break; @@ -1923,9 +1923,9 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) bool KWCanvas::focusNextPrevChild( bool next) { Q_UNUSED(next); - 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" // Don't allow to go out of the canvas widget by pressing Tab, but do allow Shift+Tab. - // if (next) return TRUE; + // if (next) return true; // return TQWidget::focusNextPrevChild( next ); } @@ -2372,7 +2372,7 @@ void FrameMovePolicy::handleMouseMove(TQt::ButtonState keyState, const KoPoint & kdDebug() << " point.x()=" << point.x() << endl; */ TQPtrList<KWTableFrameSet> tablesMoved; - tablesMoved.setAutoDelete( FALSE ); + tablesMoved.setAutoDelete( false ); TQRegion repaintRegion; KoPoint _move=m_boundingRect.topLeft() - oldBoundingRect.topLeft(); diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp index f00232cba..c72bd5dba 100644 --- a/kword/KWCommand.cpp +++ b/kword/KWCommand.cpp @@ -121,7 +121,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) { // Create new parag // Lowlevel method: - c->splitAndInsertEmptyParag( FALSE, TRUE ); + c->splitAndInsertEmptyParag( false, true ); // Highlevel method: //c->insert( "\n", true ); } @@ -159,7 +159,7 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) KoTextFormat * defaultFormat = doc->formatCollection()->format( &f ); // Last paragraph (i.e. only one in all) : some of the text might be from before the paste int endIndex = (item == count-1) ? c->index() : parag->string()->length() - 1; - parag->setFormat( m_idx, endIndex - m_idx, defaultFormat, TRUE ); + parag->setFormat( m_idx, endIndex - m_idx, defaultFormat, true ); } } @@ -176,11 +176,11 @@ KoTextCursor * KWPasteTextCommand::execute( KoTextCursor *c ) // Last paragraph: some of the text might be from before the paste int len = (item == count-1) ? c->index() : parag->string()->length(); // Apply default format - parag->setFormat( 0, len, parag->paragFormat(), TRUE ); + parag->setFormat( 0, len, parag->paragFormat(), true ); parag->loadFormatting( paragElem, 0, (textFs->isMainFrameset()) ); } parag->invalidate(0); // the formatting will be done by caller (either KWTextFrameSet::pasteOasis or KoTextObject::undo/redo) - parag->setChanged( TRUE ); + parag->setChanged( true ); parag = static_cast<KWTextParag *>(parag->next()); //kdDebug() << "KWPasteTextCommand::execute going to next parag: " << parag << endl; } diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp index c6469aceb..3edd614c1 100644 --- a/kword/KWDocument.cpp +++ b/kword/KWDocument.cpp @@ -503,7 +503,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) m_pageHeaderFooter.ptFooterBodySpacing = 10; m_pageHeaderFooter.ptFootNoteBodySpacing = 10; - bool ok = FALSE; + bool ok = false; if ( isEmbedded() ) { @@ -513,7 +513,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) if ( !ok ) showLoadingErrorDialog(); setEmpty(); - setModified( FALSE ); + setModified( false ); return ok; } else if (flags==KoDocument::InitDocEmpty) @@ -524,7 +524,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) if ( !ok ) showLoadingErrorDialog(); setEmpty(); - setModified( FALSE ); + setModified( false ); return ok; } @@ -558,7 +558,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget) showLoadingErrorDialog(); setEmpty(); } - setModified( FALSE ); + setModified( false ); return ok; } @@ -606,7 +606,7 @@ void KWDocument::initEmpty() if ( !ok ) showLoadingErrorDialog(); resetURL(); - setModified( FALSE ); + setModified( false ); setEmpty(); } @@ -999,10 +999,10 @@ bool KWDocument::loadChildren( KoStore *store ) TQPtrListIterator<KoDocumentChild> it( children() ); for( ; it.current(); ++it ) { if ( !it.current()->loadDocument( store ) ) - return FALSE; + return false; } - return TRUE; + return true; } void KWDocument::loadPictureMap ( TQDomElement& domElement ) @@ -3699,7 +3699,7 @@ TQValueList<KoPictureKey> KWDocument::savePictureList() bool KWDocument::completeSaving( KoStore *store ) { if ( !store ) - return TRUE; + return true; TQString u = KURL( url() ).path(); @@ -3876,7 +3876,7 @@ KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e return 0; KWDocumentChild* ch = createChildDoc( rect, doc ); - setModified( TRUE ); + setModified( true ); KWPartFrameSet *frameset = new KWPartFrameSet( this, ch, TQString() ); KWFrame *frame = new KWFrame(frameset, rect.x(), rect.y(), rect.width(), rect.height() ); @@ -4103,7 +4103,7 @@ kdDebug() << "KWDocument::canRemovePage " << num<< endl; return false; } #ifdef DEBUG_PAGES - kdDebug(32002) << "KWDocument::canRemovePage " << num << "-> TRUE" << endl; + kdDebug(32002) << "KWDocument::canRemovePage " << num << "-> true" << endl; #endif return true; } diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp index d141935b3..0aeb8efee 100644 --- a/kword/KWFrameDia.cpp +++ b/kword/KWFrameDia.cpp @@ -857,7 +857,7 @@ void KWFrameDia::setupTab3(){ // TAB Frameset item->setText( 1, fs->name() ); amount++; if( m_frame && m_frame->frameSet() == fs ) { - m_lFrameSList->setSelected(item, TRUE ); + m_lFrameSList->setSelected(item, true ); m_oldFrameSetName = fs->name(); m_rExistingFrameset->setChecked(true); } diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h index 4f98ec24f..00d807d0c 100644 --- a/kword/KWFrameSet.h +++ b/kword/KWFrameSet.h @@ -76,7 +76,7 @@ public: virtual FrameSetType type() const { return FT_BASE; } virtual void addTextFrameSets( TQPtrList<KWTextFrameSet> & /*lst*/, bool /*onlyReadWrite*/ = false ) {}; - virtual bool ownLine() const { return FALSE;} + virtual bool ownLine() const { return false;} /** The different types of textFramesets (that TEXT is important here!) * FI_BODY = normal text frames.<br> diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp index b31f9789f..8de83f60d 100644 --- a/kword/KWImportStyleDia.cpp +++ b/kword/KWImportStyleDia.cpp @@ -50,7 +50,7 @@ KWImportStyleDia::~KWImportStyleDia() void KWImportStyleDia::loadFile() { - KFileDialog fd( TQString(), TQString(), 0, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), 0, 0, true ); TQStringList lst = "application/x-kword"; #if 0 lst << "application/vnd.oasis.opendocument.text"; @@ -206,7 +206,7 @@ TQString KWImportFrameTableStyleDia::generateStyleName( const TQString & templat void KWImportFrameTableStyleDia::loadFile() { - KFileDialog fd( TQString(), TQString(), 0, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), 0, 0, true ); TQStringList lst = "application/x-kword"; #if 0 lst << "application/vnd.oasis.opendocument.text"; diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp index 97fb081d4..129ee6a1a 100644 --- a/kword/KWInsertPageDia.cpp +++ b/kword/KWInsertPageDia.cpp @@ -28,17 +28,17 @@ #include <tqvbox.h> KWInsertPageDia::KWInsertPageDia( TQWidget *parent, const char* name ) - : KDialogBase( parent, name,TRUE,i18n("Insert Page"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Insert Page"),Ok|Cancel ) { TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Insert Page" ),page ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); m_after = new TQRadioButton( i18n("After"), grp ); m_before = new TQRadioButton( i18n("Before"), grp ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); m_after->setChecked( true ); resize( 200, 150 ); setFocus(); diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp index 002b0bf0c..fb0e52387 100644 --- a/kword/KWInsertPicDia.cpp +++ b/kword/KWInsertPicDia.cpp @@ -150,7 +150,7 @@ KoPicture KWInsertPicDia::selectPictureDia( const TQString & _path, TQWidget* pa TQStringList mimetypes ( KImageIO::mimeTypes( KImageIO::Reading ) ); mimetypes += KoPictureFilePreview::clipartMimeTypes(); - KFileDialog fd( _path, TQString(), parent, 0, TRUE ); + KFileDialog fd( _path, TQString(), parent, 0, true ); fd.setMimeFilter( mimetypes ); fd.setCaption(i18n("Choose Picture")); return selectPicture( fd, parent ); diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp index 9a8c5ecf5..4390661a3 100644 --- a/kword/KWSortDia.cpp +++ b/kword/KWSortDia.cpp @@ -28,17 +28,17 @@ #include <tqvbox.h> KWSortDia::KWSortDia( TQWidget *parent, const char* name ) - : KDialogBase( parent, name,TRUE,i18n("Sort Text"),Ok|Cancel ) + : KDialogBase( parent, name,true,i18n("Sort Text"),Ok|Cancel ) { TQVBox *page = makeVBoxMainWidget(); TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Sort" ),page ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); grp->layout(); m_increase = new TQRadioButton( i18n("Increase"), grp ); m_decrease = new TQRadioButton( i18n("Decrease"), grp ); - grp->setRadioButtonExclusive( TRUE ); + grp->setRadioButtonExclusive( true ); m_increase->setChecked( true ); resize( 200, 150 ); setFocus(); diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp index 06cf3860d..392772208 100644 --- a/kword/KWTableDia.cpp +++ b/kword/KWTableDia.cpp @@ -120,7 +120,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool lHei = new TQLabel( i18n( "Cell heights:" ), tab1 ); grid->addWidget( lHei, 4, 0 ); - cHei = new TQComboBox( FALSE, tab1 ); + cHei = new TQComboBox( false, tab1 ); cHei->insertItem( i18n( "Automatic" ) ); cHei->insertItem( i18n( "Manual" ) ); cHei->setCurrentItem( (int)hei ); @@ -129,7 +129,7 @@ void KWTableDia::setupTab1( int rows, int cols, CellSize wid, CellSize hei, bool lWid = new TQLabel( i18n( "Cell widths:" ), tab1 ); grid->addWidget( lWid, 6, 0 ); - cWid = new TQComboBox( FALSE, tab1 ); + cWid = new TQComboBox( false, tab1 ); cWid->insertItem( i18n( "Automatic" ) ); cWid->insertItem( i18n( "Manual" ) ); cWid->setCurrentItem( (int)wid ); diff --git a/kword/KWTextDocument.h b/kword/KWTextDocument.h index 30aa9b3f7..13bea7d9d 100644 --- a/kword/KWTextDocument.h +++ b/kword/KWTextDocument.h @@ -44,7 +44,7 @@ public: ~KWTextDocument(); - virtual KoTextParag * createParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = TRUE ); + virtual KoTextParag * createParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = true ); /** Return the text frameset in which this document is. * Note that this can be 0L (e.g. for paragraphs in the paragdia preview) */ diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index d0fbff38c..79b781b7d 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -806,7 +806,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor TQMAX(0, iPoint.x() - 5), // negative values create problems iPoint.y(), clip.width(), clip.height(), pix, cg, m_doc, // TODO view's zoom handler - 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 parag->setLineChanged( oldLineChanged ); // -1 = all @@ -1540,7 +1540,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint & int n2 = len - 1; double internalY = 0.0; int mid = 0; - bool found = FALSE; + bool found = false; while ( n1 <= n2 ) { double res; mid = (n1 + n2)/2; @@ -3506,7 +3506,7 @@ void KWTextFrameSetEdit::mousePressEvent( TQMouseEvent *e, const TQPoint &, cons if ( addParag ) frameSet()->kWordDocument()->setModified(true ); } - // else mightStartDrag = FALSE; necessary? + // else mightStartDrag = false; necessary? if ( e->button() != TQt::LeftButton ) return; diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp index aae68085d..86f7598d2 100644 --- a/kword/KWTextParag.cpp +++ b/kword/KWTextParag.cpp @@ -592,7 +592,7 @@ void KWTextParag::load( TQDomElement &attributes ) //kdDebug() << "KWTextParag::load '" << element.text() << "'" << endl; append( element.text() ); // Apply default format - this should be automatic !! - setFormat( 0, string()->length(), paragFormat(), TRUE ); + setFormat( 0, string()->length(), paragFormat(), true ); } if ( attributes.attribute( "toc" ) == "true" ) diff --git a/kword/KWTextParag.h b/kword/KWTextParag.h index de484a485..379fdf5b9 100644 --- a/kword/KWTextParag.h +++ b/kword/KWTextParag.h @@ -40,7 +40,7 @@ typedef KoParagLayout KWParagLayout; class KWTextParag : public KoTextParag { public: - KWTextParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = TRUE ) + KWTextParag( KoTextDocument *d, KoTextParag *pr = 0, KoTextParag *nx = 0, bool updateIds = true ) : KoTextParag( d, pr, nx, updateIds ) { } ~KWTextParag() { } diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 278ea451b..598aa403e 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -270,8 +270,8 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW TQObject::connect( this, TQ_SIGNAL( embeddImage( const TQString & ) ), this, TQ_SLOT( slotEmbedImage( const TQString & ) ) ); - setKeyCompression( TRUE ); - setAcceptDrops( TRUE ); + setKeyCompression( true ); + setAcceptDrops( true ); setupActions(); @@ -501,7 +501,7 @@ void KWView::initGui() m_gui->canvasWidget()->setMouseMode( m_gui->canvasWidget()->mouseMode() ); bool editingFormula = dynamic_cast<KWFormulaFrameSetEdit *>( m_gui->canvasWidget()->currentFrameSetEdit() ) != 0; - //showFormulaToolbar( FALSE ); // not called, to avoid creating the formula-document if not necessary + //showFormulaToolbar( false ); // not called, to avoid creating the formula-document if not necessary if(shell()) shell()->showToolbar( "formula_toolbar", editingFormula ); @@ -929,7 +929,7 @@ void KWView::setupActions() this, TQ_SLOT( textAlignLeft() ), actionCollection(), "format_alignleft" ); m_actionFormatAlignLeft->setExclusiveGroup( "align" ); - m_actionFormatAlignLeft->setChecked( TRUE ); + m_actionFormatAlignLeft->setChecked( true ); m_actionFormatAlignCenter = new TDEToggleAction( i18n( "Align &Center" ), "text_center", TQt::CTRL + TQt::ALT + TQt::Key_C, this, TQ_SLOT( textAlignCenter() ), actionCollection(), "format_aligncenter" ); @@ -1448,7 +1448,7 @@ void KWView::loadexpressionActions( TDEActionMenu * parentMenu) } } - //TQStringList files = KWFactory::instance()->dirs()->findAllResources( "expression", "*.xml", TRUE ); + //TQStringList files = KWFactory::instance()->dirs()->findAllResources( "expression", "*.xml", true ); int i = 0; int nbFile = 0; for( TQStringList::Iterator it = files.begin(); it != files.end(); ++it,nbFile++ ) @@ -1820,22 +1820,22 @@ void KWView::print( KPrinter &prt ) //kdDebug() << "KWView::print metrics: " << metrics.logicalDpiX() << "," << metrics.logicalDpiY() << endl; //kdDebug() << "x11AppDPI: " << KoGlobal::dpiX() << "," << KoGlobal::dpiY() << endl; - bool serialLetter = FALSE; + bool serialLetter = false; TQPtrList<KoVariable> vars = m_doc->variableCollection()->getVariables(); KoVariable *v = 0; for ( v = vars.first(); v; v = vars.next() ) { if ( v->type() == VT_MAILMERGE ) { - serialLetter = TRUE; + serialLetter = true; break; } } - if ( !m_doc->mailMergeDataBase() ) serialLetter=FALSE; + if ( !m_doc->mailMergeDataBase() ) serialLetter=false; else { m_doc->mailMergeDataBase()->refresh(false); - if (m_doc->mailMergeDataBase()->getNumRecords() == 0 ) serialLetter = FALSE; + if (m_doc->mailMergeDataBase()->getNumRecords() == 0 ) serialLetter = false; } //float left_margin = 0.0; @@ -2006,16 +2006,16 @@ void KWView::showAlign( int align ) { kdWarning() << k_funcinfo << "shouldn't be called with AlignAuto" << endl; // fallthrough case TQt::AlignLeft: - m_actionFormatAlignLeft->setChecked( TRUE ); + m_actionFormatAlignLeft->setChecked( true ); break; case TQt::AlignHCenter: - m_actionFormatAlignCenter->setChecked( TRUE ); + m_actionFormatAlignCenter->setChecked( true ); break; case TQt::AlignRight: - m_actionFormatAlignRight->setChecked( TRUE ); + m_actionFormatAlignRight->setChecked( true ); break; case TQt::AlignJustify: - m_actionFormatAlignBlock->setChecked( TRUE ); + m_actionFormatAlignBlock->setChecked( true ); break; } } @@ -2024,18 +2024,18 @@ void KWView::showSpacing( int spacing ) { switch ( spacing ) { case KoParagLayout::LS_SINGLE: - m_actionFormatSpacingSingle->setChecked( TRUE ); + m_actionFormatSpacingSingle->setChecked( true ); break; case KoParagLayout::LS_ONEANDHALF: - m_actionFormatSpacingOneAndHalf->setChecked( TRUE ); + m_actionFormatSpacingOneAndHalf->setChecked( true ); break; case KoParagLayout::LS_DOUBLE: - m_actionFormatSpacingDouble->setChecked( TRUE ); + m_actionFormatSpacingDouble->setChecked( true ); break; default: - m_actionFormatSpacingSingle->setChecked( FALSE ); - m_actionFormatSpacingOneAndHalf->setChecked( FALSE ); - m_actionFormatSpacingDouble->setChecked( FALSE ); + m_actionFormatSpacingSingle->setChecked( false ); + m_actionFormatSpacingOneAndHalf->setChecked( false ); + m_actionFormatSpacingDouble->setChecked( false ); } } @@ -2164,10 +2164,10 @@ void KWView::showMouseMode( int mouseMode ) break; } - m_actionTableJoinCells->setEnabled( FALSE ); - m_actionTableSplitCells->setEnabled( FALSE ); + m_actionTableJoinCells->setEnabled( false ); + m_actionTableSplitCells->setEnabled( false ); m_actionTableProtectCells->setEnabled( false ); - m_actionFormatFrameSet->setEnabled(FALSE); + m_actionFormatFrameSet->setEnabled(false); m_actionTablePropertiesMenu->setEnabled( false ); m_actionConvertTableToText->setEnabled( false ); } @@ -2914,7 +2914,7 @@ void KWView::editMailMergeDataBase() KWMailMergeEditor *dia = new KWMailMergeEditor( this, m_doc->mailMergeDataBase() ); dia->exec(); // Don't know if we really need this so it's commented out (SL) - // m_gui->canvasWidget()->repaintAll( FALSE ); + // m_gui->canvasWidget()->repaintAll( false ); delete dia; #endif } @@ -5677,7 +5677,7 @@ void KWView::spellCheckerRemoveHighlight() } KWTextFrameSetEdit * edit = currentTextEdit(); if (edit) - edit->drawCursor( TRUE ); + edit->drawCursor( true ); } void KWView::spellAddAutoCorrect (const TQString & originalword, const TQString & newword) @@ -6029,7 +6029,7 @@ void KWView::setViewFrameBorders(bool b) bool KWView::doubleClickActivation() const { - return TRUE; + return true; } TQWidget* KWView::canvas() const @@ -6104,7 +6104,7 @@ void KWView::savePicture() kdDebug() << "Picture has mime type: " << mimetype << endl; 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); @@ -6732,7 +6732,7 @@ void KWView::docStructSpeak() void KWView::insertFile() { - KFileDialog fd( TQString(), TQString(), this, 0, TRUE ); + KFileDialog fd( TQString(), TQString(), this, 0, true ); fd.setMimeFilter( "application/x-kword" ); fd.setCaption(i18n("Insert File")); KURL url; @@ -7660,8 +7660,8 @@ KWGUI::KWGUI( const TQString& viewMode, TQWidget *parent, KWView *daView ) connect( m_horRuler, TQ_SIGNAL( tabListChanged( const KoTabulatorList & ) ), m_view, TQ_SLOT( tabListChanged( const KoTabulatorList & ) ) ); - setKeyCompression( TRUE ); - setAcceptDrops( TRUE ); + setKeyCompression( true ); + setAcceptDrops( true ); setFocusPolicy( TQWidget::NoFocus ); } diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp index c05ad1aec..bd8f7c07d 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.cpp +++ b/kword/mailmerge/KWClassicSerialDataSource.cpp @@ -244,7 +244,7 @@ KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *parent, KW setSorting( -1 ); addColumn( i18n( "Name" ) ); addColumn( i18n( "Value" ) ); - header()->setMovingEnabled( FALSE ); + header()->setMovingEnabled( false ); connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), this, TQ_SLOT( columnSizeChange( int, int, int ) ) ); // connect( header(), TQ_SIGNAL( sectionClicked( int ) ), @@ -546,7 +546,7 @@ void KWClassicMailMergeEditor::removeRecord() } else { dbList->clear(); - records->setEnabled( FALSE ); + records->setEnabled( false ); } if ( db->getNumRecords() == 0 ) diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h index 9e0581b25..aca7ae9bc 100644 --- a/kword/mailmerge/KWClassicSerialDataSource.h +++ b/kword/mailmerge/KWClassicSerialDataSource.h @@ -114,7 +114,7 @@ public: void updateItems(); void displayRecord( int i ); - void setSorting( int, bool increasing = TRUE ) { + void setSorting( int, bool increasing = true ) { TQListView::setSorting( -1, increasing ); } diff --git a/kword/mailmerge/sql/KWMySqlCursor.h b/kword/mailmerge/sql/KWMySqlCursor.h index f08b62aea..d737c3ccf 100644 --- a/kword/mailmerge/sql/KWMySqlCursor.h +++ b/kword/mailmerge/sql/KWMySqlCursor.h @@ -38,7 +38,7 @@ class KWMySqlCursor: public TQSqlCursor { public: KWMySqlCursor( const TQString & query = TQString(), bool autopopulate = -TRUE, TQSqlDatabase* db = 0 ): TQSqlCursor( TQString(), autopopulate, db ) +true, TQSqlDatabase* db = 0 ): TQSqlCursor( TQString(), autopopulate, db ) { exec( query ); if ( autopopulate ) @@ -47,7 +47,7 @@ TRUE, TQSqlDatabase* db = 0 ): TQSqlCursor( TQString(), autopopulate, db ) setMode( TQSqlCursor::ReadOnly ); } KWMySqlCursor( const KWMySqlCursor & other ): TQSqlCursor( other ) {} - KWMySqlCursor( const TQSqlQuery & query, bool autopopulate = TRUE ): + KWMySqlCursor( const TQSqlQuery & query, bool autopopulate = true ): TQSqlCursor( TQString(), autopopulate ) { *(TQSqlQuery*)this = query; @@ -57,12 +57,12 @@ TQSqlCursor( TQString(), autopopulate ) } bool select( const TQString & /*filter*/, const TQSqlIndex & /*sort*/ = TQSqlIndex() ) { return exec( lastQuery() ); } - TQSqlIndex primaryIndex( bool /*prime*/ = TRUE ) const { return + TQSqlIndex primaryIndex( bool /*prime*/ = true ) const { return TQSqlIndex(); } - int insert( bool /*invalidate*/ = TRUE ) { return FALSE; } - int update( bool /*invalidate*/ = TRUE ) { return FALSE; } - int del( bool /*invalidate*/ = TRUE ) { return FALSE; } - void setName( const TQString& /*name*/, bool /*autopopulate*/ = TRUE ) {} + int insert( bool /*invalidate*/ = true ) { return false; } + int update( bool /*invalidate*/ = true ) { return false; } + int del( bool /*invalidate*/ = true ) { return false; } + void setName( const TQString& /*name*/, bool /*autopopulate*/ = true ) {} }; |