1 files changed, 79 insertions, 79 deletions

diff --git a/kspread/KSpreadLayoutIface.cc b/kspread/KSpreadLayoutIface.cc
index 1ca174cf..8099df6f 100644
--- a/kspread/KSpreadLayoutIface.cc
+++ b/kspread/KSpreadLayoutIface.cc
@@ -21,54 +21,54 @@
 */
 
 #include "KSpreadLayoutIface.h"
-#include <tqbrush.h>
+#include <brush.h>
 #include "kspread_format.h"
 
 using namespace KSpread;
 
 LayoutIface::LayoutIface(Format *_layout)
 {
-    tqlayout=_layout;
+    layout=_layout;
 }
 
 void LayoutIface::setBgColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setBgColor(c);
+    layout->setBgColor(c);
 }
 
 void LayoutIface::setBgColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setBgColor(c);
+    layout->setBgColor(c);
 }
 
 
 void LayoutIface::setTextColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setTextColor(c);
+    layout->setTextColor(c);
 }
 
 void LayoutIface::setTextColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setTextColor(c);
+    layout->setTextColor(c);
 }
 
 void LayoutIface::setAngle(int angle)
 {
-    tqlayout->setAngle(angle);
+    layout->setAngle(angle);
 }
 
 void LayoutIface::setVerticalText(bool _vertical)
 {
-    tqlayout->setVerticalText(_vertical);
+    layout->setVerticalText(_vertical);
 }
 
 void LayoutIface::setMultiRow(bool _multi)
 {
-    tqlayout->setMultiRow( _multi );
+    layout->setMultiRow( _multi );
 }
 
 void LayoutIface::setAlign( const TQString& _Align )
@@ -82,7 +82,7 @@ void LayoutIface::setAlign( const TQString& _Align )
         Align=Format::Center;
     else
         Align=Format::Undefined;
-    tqlayout->setAlign( Align);
+    layout->setAlign( Align);
 }
 
 void LayoutIface::setAlignY( const TQString& _AlignY )
@@ -96,23 +96,23 @@ void LayoutIface::setAlignY( const TQString& _AlignY )
         AlignY=Format::Bottom;
     else
         AlignY=Format::Middle;
-    tqlayout->setAlignY( AlignY);
+    layout->setAlignY( AlignY);
 }
 
 void LayoutIface::setPostfix(const TQString &_postfix)
 {
-    tqlayout->setPostfix( _postfix );
+    layout->setPostfix( _postfix );
 }
 
 void LayoutIface::setPrefix(const TQString &_prefix)
 {
-    tqlayout->setPrefix( _prefix );
+    layout->setPrefix( _prefix );
 }
 
 void LayoutIface::setFormatType(const TQString &_formatType)
 {
     FormatType format;
-    tqlayout->setPrecision(2);
+    layout->setPrecision(2);
     if (_formatType=="Generic")
         format = Generic_format;
     else if(_formatType=="Number")
@@ -151,43 +151,43 @@ void LayoutIface::setFormatType(const TQString &_formatType)
         format=fraction_three_digits;
     else
         format=Generic_format;
-    tqlayout->setFormatType( format);
+    layout->setFormatType( format);
 }
 
 
 void LayoutIface::setPrecision(int _p)
 {
-    tqlayout->setPrecision( _p );
+    layout->setPrecision( _p );
 }
 
 void LayoutIface::setTextFontBold(bool _b)
 {
-    tqlayout->setTextFontBold( _b );
+    layout->setTextFontBold( _b );
 }
 
 void LayoutIface::setTextFontItalic(bool _b)
 {
-    tqlayout->setTextFontItalic( _b );
+    layout->setTextFontItalic( _b );
 }
 
 void LayoutIface::setTextFontUnderline(bool _b)
 {
-    tqlayout->setTextFontUnderline( _b );
+    layout->setTextFontUnderline( _b );
 }
 
 void LayoutIface::setTextFontStrike(bool _b)
 {
-    tqlayout->setTextFontStrike( _b );
+    layout->setTextFontStrike( _b );
 }
 
 void LayoutIface::setTextFontSize( int _size )
 {
-    tqlayout->setTextFontSize( _size );
+    layout->setTextFontSize( _size );
 }
 
 void LayoutIface::setTextFontFamily( const TQString& _font )
 {
-    tqlayout->setTextFontFamily( _font );
+    layout->setTextFontFamily( _font );
 }
 
 
@@ -195,34 +195,34 @@ void LayoutIface::setTextFontFamily( const TQString& _font )
 void LayoutIface::setLeftBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setLeftBorderStyle(Qt::DotLine);
+        layout->setLeftBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setLeftBorderStyle(Qt::DashLine);
+        layout->setLeftBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setLeftBorderStyle(Qt::DashDotLine);
+        layout->setLeftBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setLeftBorderStyle(Qt::DashDotDotLine);
+        layout->setLeftBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setLeftBorderStyle(Qt::SolidLine);
+        layout->setLeftBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setLeftBorderStyle(Qt::SolidLine);
+        layout->setLeftBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setLeftBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setLeftBorderColor(c );
+    layout->setLeftBorderColor(c );
 }
 
 void LayoutIface::setLeftBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setLeftBorderColor(c );
+    layout->setLeftBorderColor(c );
 }
 
 void LayoutIface::setLeftBorderWidth( int _size )
 {
-    tqlayout->setLeftBorderWidth( _size );
+    layout->setLeftBorderWidth( _size );
 }
 
 
@@ -230,34 +230,34 @@ void LayoutIface::setLeftBorderWidth( int _size )
 void LayoutIface::setRightBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setRightBorderStyle(Qt::DotLine);
+        layout->setRightBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setRightBorderStyle(Qt::DashLine);
+        layout->setRightBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setRightBorderStyle(Qt::DashDotLine);
+        layout->setRightBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setRightBorderStyle(Qt::DashDotDotLine);
+        layout->setRightBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setRightBorderStyle(Qt::SolidLine);
+        layout->setRightBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setRightBorderStyle(Qt::SolidLine);
+        layout->setRightBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setRightBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setRightBorderColor(c );
+    layout->setRightBorderColor(c );
 }
 
 void LayoutIface::setRightBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setRightBorderColor(c );
+    layout->setRightBorderColor(c );
 }
 
 void LayoutIface::setRightBorderWidth( int _size )
 {
-    tqlayout->setRightBorderWidth( _size );
+    layout->setRightBorderWidth( _size );
 }
 
 
@@ -265,34 +265,34 @@ void LayoutIface::setRightBorderWidth( int _size )
 void LayoutIface::setTopBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setTopBorderStyle(Qt::DotLine);
+        layout->setTopBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setTopBorderStyle(Qt::DashLine);
+        layout->setTopBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setTopBorderStyle(Qt::DashDotLine);
+        layout->setTopBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setTopBorderStyle(Qt::DashDotDotLine);
+        layout->setTopBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setTopBorderStyle(Qt::SolidLine);
+        layout->setTopBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setTopBorderStyle(Qt::SolidLine);
+        layout->setTopBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setTopBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setTopBorderColor(c );
+    layout->setTopBorderColor(c );
 }
 
 void LayoutIface::setTopBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setTopBorderColor(c );
+    layout->setTopBorderColor(c );
 }
 
 void LayoutIface::setTopBorderWidth( int _size )
 {
-    tqlayout->setTopBorderWidth( _size );
+    layout->setTopBorderWidth( _size );
 }
 
 
@@ -300,33 +300,33 @@ void LayoutIface::setTopBorderWidth( int _size )
 void LayoutIface::setBottomBorderStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setBottomBorderStyle(Qt::DotLine);
+        layout->setBottomBorderStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setBottomBorderStyle(Qt::DashLine);
+        layout->setBottomBorderStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setBottomBorderStyle(Qt::DashDotLine);
+        layout->setBottomBorderStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setBottomBorderStyle(Qt::DashDotDotLine);
+        layout->setBottomBorderStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setBottomBorderStyle(Qt::SolidLine);
+        layout->setBottomBorderStyle(Qt::SolidLine);
     else
-        tqlayout->setBottomBorderStyle(Qt::SolidLine);
+        layout->setBottomBorderStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setBottomBorderColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setBottomBorderColor(c );
+    layout->setBottomBorderColor(c );
 }
 void LayoutIface::setBottomBorderColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setBottomBorderColor(c );
+    layout->setBottomBorderColor(c );
 }
 
 void LayoutIface::setBottomBorderWidth( int _size )
 {
-    tqlayout->setBottomBorderWidth( _size );
+    layout->setBottomBorderWidth( _size );
 }
 
 
@@ -334,33 +334,33 @@ void LayoutIface::setBottomBorderWidth( int _size )
 void LayoutIface::setFallDiagonalStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setFallDiagonalStyle(Qt::DotLine);
+        layout->setFallDiagonalStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setFallDiagonalStyle(Qt::DashLine);
+        layout->setFallDiagonalStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setFallDiagonalStyle(Qt::DashDotLine);
+        layout->setFallDiagonalStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setFallDiagonalStyle(Qt::DashDotDotLine);
+        layout->setFallDiagonalStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setFallDiagonalStyle(Qt::SolidLine);
+        layout->setFallDiagonalStyle(Qt::SolidLine);
     else
-        tqlayout->setFallDiagonalStyle(Qt::SolidLine);
+        layout->setFallDiagonalStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setFallDiagonalColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setFallDiagonalColor(c );
+    layout->setFallDiagonalColor(c );
 }
 void LayoutIface::setFallDiagonalColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setFallDiagonalColor(c );
+    layout->setFallDiagonalColor(c );
 }
 
 void LayoutIface::setFallDiagonalWidth( int _size )
 {
-    tqlayout->setFallDiagonalWidth( _size );
+    layout->setFallDiagonalWidth( _size );
 }
 
 
@@ -369,47 +369,47 @@ void LayoutIface::setFallDiagonalWidth( int _size )
 void LayoutIface::setGoUpDiagonalStyle( const TQString& _style )
 {
     if(_style=="DotLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DotLine);
+        layout->setGoUpDiagonalStyle(Qt::DotLine);
     else if(_style=="DashLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DashLine);
+        layout->setGoUpDiagonalStyle(Qt::DashLine);
     else if(_style=="DashDotLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DashDotLine);
+        layout->setGoUpDiagonalStyle(Qt::DashDotLine);
     else if(_style=="DashDotDotLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::DashDotDotLine);
+        layout->setGoUpDiagonalStyle(Qt::DashDotDotLine);
     else if(_style=="SolidLine")
-        tqlayout->setGoUpDiagonalStyle(Qt::SolidLine);
+        layout->setGoUpDiagonalStyle(Qt::SolidLine);
     else
-        tqlayout->setGoUpDiagonalStyle(Qt::SolidLine);
+        layout->setGoUpDiagonalStyle(Qt::SolidLine);
 }
 
 void LayoutIface::setGoUpDiagonalColor(const TQString& _c)
 {
     TQColor c(_c);
-    tqlayout->setGoUpDiagonalColor(c );
+    layout->setGoUpDiagonalColor(c );
 }
 void LayoutIface::setGoUpDiagonalColor(int r,int g,int b)
 {
     TQColor c(r,g,b);
-    tqlayout->setGoUpDiagonalColor(c );
+    layout->setGoUpDiagonalColor(c );
 }
 
 void LayoutIface::setGoUpDiagonalWidth( int _size )
 {
-    tqlayout->setGoUpDiagonalWidth( _size );
+    layout->setGoUpDiagonalWidth( _size );
 }
 
 
 void LayoutIface::setIndent( double indent )
 {
     if( indent >= 0.0 )
-        tqlayout->setIndent( indent );
+        layout->setIndent( indent );
     else
-        tqlayout->setIndent( 0.0 );
+        layout->setIndent( 0.0 );
 }
 
 
 void LayoutIface::setDontPrintText ( bool _print)
 {
-    tqlayout->setDontPrintText ( _print);
+    layout->setDontPrintText ( _print);
 }