diff options
Diffstat (limited to 'kugar')
-rw-r--r-- | kugar/kudesigner/kudesigner_doc.cpp | 6 | ||||
-rw-r--r-- | kugar/kudesigner/kudesigner_doc.h | 2 | ||||
-rw-r--r-- | kugar/kudesigner/kudesigner_view.cpp | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/band.h | 2 | ||||
-rw-r--r-- | kugar/kudesigner_lib/canvas.cpp | 2 | ||||
-rw-r--r-- | kugar/lib/inputmask.cpp | 40 | ||||
-rw-r--r-- | kugar/lib/inputmask.h | 2 | ||||
-rw-r--r-- | kugar/part/kugar_part.cpp | 2 |
8 files changed, 29 insertions, 29 deletions
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp index 68d3cdc52..e934aa5bd 100644 --- a/kugar/kudesigner/kudesigner_doc.cpp +++ b/kugar/kudesigner/kudesigner_doc.cpp @@ -69,7 +69,7 @@ void KudesignerDoc::addCommand( KCommand *cmd ) bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* parentWidget ) { // If nothing is loaded, do initialize here - bool ok = FALSE; + bool ok = false; // TODO if (flags==KoDocument::InitDocEmpty) @@ -105,7 +105,7 @@ bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* parentWidget ) showLoadingErrorDialog(); setEmpty(); } - setModified( FALSE ); + setModified( false ); return ok; } @@ -143,7 +143,7 @@ void KudesignerDoc::paintContent( TQPainter& painter, const TQRect& rect, bool / // Need to draw only the document rectangle described in the parameter rect. - canvas() ->drawArea( rect, &painter, TRUE ); + canvas() ->drawArea( rect, &painter, true ); } diff --git a/kugar/kudesigner/kudesigner_doc.h b/kugar/kudesigner/kudesigner_doc.h index 38c82e37c..bf5d2a3ab 100644 --- a/kugar/kudesigner/kudesigner_doc.h +++ b/kugar/kudesigner/kudesigner_doc.h @@ -43,7 +43,7 @@ public: ~KudesignerDoc(); - virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); + virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 ); virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget ); diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index d38e0da37..2d0c57e9d 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -166,7 +166,7 @@ void KudesignerView::paintEvent( TQPaintEvent* ev ) // ### TODO: Scaling // Let the document do the drawing - koDocument() ->paintEverything( painter, ev->rect(), FALSE, this ); + koDocument() ->paintEverything( painter, ev->rect(), false, this ); painter.end(); } diff --git a/kugar/kudesigner_lib/band.h b/kugar/kudesigner_lib/band.h index c45cc18e6..844dde1f7 100644 --- a/kugar/kudesigner_lib/band.h +++ b/kugar/kudesigner_lib/band.h @@ -51,7 +51,7 @@ public: int minHeight(); TQRect bottomMiddleResizableRect(); - void arrange( int base, bool destructive = TRUE ); + void arrange( int base, bool destructive = true ); virtual void updateGeomProps(); TQCanvasItemList items; diff --git a/kugar/kudesigner_lib/canvas.cpp b/kugar/kudesigner_lib/canvas.cpp index 930d57b8d..6db812f82 100644 --- a/kugar/kudesigner_lib/canvas.cpp +++ b/kugar/kudesigner_lib/canvas.cpp @@ -189,7 +189,7 @@ bool Canvas::loadXML( const TQDomNode &report ) setReportFooterAttributes( &child ); } } - templ->arrangeSections( FALSE ); + templ->arrangeSections( false ); TQCanvasItemList l = allItems(); for ( TQCanvasItemList::Iterator it = l.begin(); it != l.end(); ++it ) { diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp index 850b7a73a..4d9319eb8 100644 --- a/kugar/lib/inputmask.cpp +++ b/kugar/lib/inputmask.cpp @@ -89,19 +89,19 @@ void InputMask::parseInputMask( const TQString &maskFields ) MaskInputData::Casemode m = MaskInputData::NoCaseMode; c = 0; bool s; - bool escape = FALSE; + bool escape = false; int index = 0; for ( i = 0; i < m_mask.length(); i++ ) { c = m_mask.at( i ); if ( escape ) { - s = TRUE; + s = true; m_maskData[ index ].maskChar = c; m_maskData[ index ].separator = s; m_maskData[ index ].caseMode = m; index++; - escape = FALSE; + escape = false; } else if ( c == '<' || c == '>' || c == '!' ) { @@ -133,12 +133,12 @@ void InputMask::parseInputMask( const TQString &maskFields ) case 'D': case 'd': case '#': - s = FALSE; + s = false; break; case '\\': - escape = TRUE; + escape = true; default: - s = TRUE; + s = true; break; } @@ -159,52 +159,52 @@ bool InputMask::isValidInput( TQChar key, TQChar mask ) const { case 'A': if ( key.isLetter() && key != m_blank ) - return TRUE; + return true; break; case 'a': if ( key.isLetter() || key == m_blank ) - return TRUE; + return true; break; case 'N': if ( key.isLetterOrNumber() && key != m_blank ) - return TRUE; + return true; break; case 'n': if ( key.isLetterOrNumber() || key == m_blank ) - return TRUE; + return true; break; case 'X': if ( key.isPrint() && key != m_blank ) - return TRUE; + return true; break; case 'x': if ( key.isPrint() || key == m_blank ) - return TRUE; + return true; break; case '9': if ( key.isNumber() && key != m_blank ) - return TRUE; + return true; break; case '0': if ( key.isNumber() || key == m_blank ) - return TRUE; + return true; break; case 'D': if ( key.isNumber() && key.digitValue() > 0 && key != m_blank ) - return TRUE; + return true; break; case 'd': if ( ( key.isNumber() && key.digitValue() > 0 ) || key == m_blank ) - return TRUE; + return true; break; case '#': if ( key.isNumber() || key == '+' || key == '-' || key == m_blank ) - return TRUE; + return true; break; default: break; } - return FALSE; + return false; } TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const @@ -249,7 +249,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons else { // search for separator first - int n = findInMask( i, TRUE, TRUE, str[ ( int ) strIndex ] ); + int n = findInMask( i, true, true, str[ ( int ) strIndex ] ); if ( n != -1 ) { if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_maskData[ i - 1 ].separator || m_maskData[ i - 1 ].maskChar != str[ ( int ) strIndex ] ) ) ) @@ -261,7 +261,7 @@ TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) cons else { // search for valid m_blank if not - n = findInMask( i, TRUE, FALSE, str[ ( int ) strIndex ] ); + n = findInMask( i, true, false, str[ ( int ) strIndex ] ); if ( n != -1 ) { s += fill.mid( i, n - i ); diff --git a/kugar/lib/inputmask.h b/kugar/lib/inputmask.h index 52ca2b9f5..e4e3f7812 100644 --- a/kugar/lib/inputmask.h +++ b/kugar/lib/inputmask.h @@ -37,7 +37,7 @@ public: private: void parseInputMask( const TQString &maskFields ); bool isValidInput( TQChar key, TQChar mask ) const; - TQString maskString( uint pos, const TQString &str, bool clear = FALSE ) const; + TQString maskString( uint pos, const TQString &str, bool clear = false ) const; TQString clearString( uint pos, uint len ) const; TQString stripString( const TQString &str ) const; int findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar = TQChar() ) const; diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 98352e139..e1d0a2761 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -135,7 +135,7 @@ bool KugarPart::initDoc( InitDocFlags /*flags*/, TQWidget* /*parentWidget*/ ) return ok; // If nothing is loaded, do initialize here - return TRUE; + return true; } KoView* KugarPart::createViewInstance( TQWidget* parent, const char* name ) |