Rename obsolete tq methods to standard names

17 files changed, 122 insertions, 122 deletions

diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c
index 79eb15e5..85872a5a 100644
--- a/kexi/3rdparty/kexisql/src/os.c
+++ b/kexi/3rdparty/kexisql/src/os.c
@@ -531,11 +531,11 @@ int sqliteOsOpenReadWrite(
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdPerm, &(id->refNum)) != noErr )
         return SQLITE_CANTOPEN;
       else
@@ -650,7 +650,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -724,7 +724,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
diff --git a/kexi/3rdparty/kexisql3/src/main.c b/kexi/3rdparty/kexisql3/src/main.c
index 1c1029f9..83356f43 100644
--- a/kexi/3rdparty/kexisql3/src/main.c
+++ b/kexi/3rdparty/kexisql3/src/main.c
@@ -667,7 +667,7 @@ const char *sqlite3_errmsg(sqlite3 *db){
 ** error.
 */
 const void *sqlite3_errmsg16(sqlite3 *db){
-  /* Because all the characters in the string are in the tqunicode
+  /* Because all the characters in the string are in the unicode
   ** range 0x00-0xFF, if we pad the big-endian string with a 
   ** zero byte, we can obtain the little-endian string with
   ** &big_endian[1].
diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c
index f393b423..285d0805 100644
--- a/kexi/3rdparty/kexisql3/src/os_mac.c
+++ b/kexi/3rdparty/kexisql3/src/os_mac.c
@@ -84,11 +84,11 @@ int sqlite3OsOpenReadWrite(
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                    fsRdPerm, &(id->refNum)) != noErr )
         return SQLITE_CANTOPEN;
       else
@@ -149,7 +149,7 @@ int sqlite3OsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdWrPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
@@ -185,7 +185,7 @@ int sqlite3OsOpenReadOnly(const char *zFilename, OsFile *id){
   if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
     return SQLITE_CANTOPEN;
   FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.tqunicode,
+  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
                  fsRdPerm, &(id->refNum)) != noErr )
     return SQLITE_CANTOPEN;
 # else
diff --git a/kexi/3rdparty/kexisql3/src/os_win.c b/kexi/3rdparty/kexisql3/src/os_win.c
index 8c729136..2b0a00ec 100644
--- a/kexi/3rdparty/kexisql3/src/os_win.c
+++ b/kexi/3rdparty/kexisql3/src/os_win.c
@@ -104,7 +104,7 @@ static WCHAR *utf8ToUnicode(const char *zFilename){
 ** Convert UTF-32 to UTF-8.  Space to hold the returned string is
 ** obtained from sqliteMalloc().
 */
-static char *tqunicodeToUtf8(const WCHAR *zWideFilename){
+static char *unicodeToUtf8(const WCHAR *zWideFilename){
   int nByte;
   char *zFilename;
 
@@ -449,7 +449,7 @@ int sqlite3OsTempFileName(char *zBuf){
     char *zMulti;
     WCHAR zWidePath[SQLITE_TEMPNAME_SIZE];
     GetTempPathW(SQLITE_TEMPNAME_SIZE-30, zWidePath);
-    zMulti = tqunicodeToUtf8(zWidePath);
+    zMulti = unicodeToUtf8(zWidePath);
     if( zMulti ){
       strncpy(zTempPath, zMulti, SQLITE_TEMPNAME_SIZE-30);
       zTempPath[SQLITE_TEMPNAME_SIZE-30] = 0;
@@ -881,7 +881,7 @@ char *sqlite3OsFullPathname(const char *zRelative){
     if( zTemp==0 ) return 0;
     GetFullPathNameW(zWide, nByte, zTemp, &zNotUsedW);
     sqliteFree(zWide);
-    zFull = tqunicodeToUtf8(zTemp);
+    zFull = unicodeToUtf8(zTemp);
     sqliteFree(zTemp);
   }else{
     nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1;
diff --git a/kexi/3rdparty/kexisql3/src/prepare.c b/kexi/3rdparty/kexisql3/src/prepare.c
index 23bfa533..a0c7be87 100644
--- a/kexi/3rdparty/kexisql3/src/prepare.c
+++ b/kexi/3rdparty/kexisql3/src/prepare.c
@@ -527,7 +527,7 @@ int sqlite3_prepare16(
 
   if( zTail8 && pzTail ){
     /* If sqlite3_prepare returns a tail pointer, we calculate the
-    ** equivalent pointer into the UTF-16 string by counting the tqunicode
+    ** equivalent pointer into the UTF-16 string by counting the unicode
     ** characters between zSql8 and zTail8, and then returning a pointer
     ** the same number of characters into the UTF-16 string.
     */
diff --git a/kexi/3rdparty/kexisql3/src/utf.c b/kexi/3rdparty/kexisql3/src/utf.c
index 5efbfe78..d42ab759 100644
--- a/kexi/3rdparty/kexisql3/src/utf.c
+++ b/kexi/3rdparty/kexisql3/src/utf.c
@@ -43,11 +43,11 @@
 **
 ** When converting malformed UTF-8 strings to UTF-16, one instance of the
 ** replacement character U+FFFD for each byte that cannot be interpeted as
-** part of a valid tqunicode character.
+** part of a valid unicode character.
 **
 ** When converting malformed UTF-16 strings to UTF-8, one instance of the
 ** replacement character U+FFFD for each pair of bytes that cannot be
-** interpeted as part of a valid tqunicode character.
+** interpeted as part of a valid unicode character.
 **
 ** This file contains the following public routines:
 **
@@ -427,10 +427,10 @@ int sqlite3VdbeMemHandleBom(Mem *pMem){
 #endif /* SQLITE_OMIT_UTF16 */
 
 /*
-** pZ is a UTF-8 encoded tqunicode string. If nByte is less than zero,
-** return the number of tqunicode characters in pZ up to (but not including)
+** pZ is a UTF-8 encoded unicode string. If nByte is less than zero,
+** return the number of unicode characters in pZ up to (but not including)
 ** the first 0x00 byte. If nByte is not less than zero, return the
-** number of tqunicode characters in the first nByte of pZ (or up to 
+** number of unicode characters in the first nByte of pZ (or up to 
 ** the first 0x00, whichever comes first).
 */
 int sqlite3utf8CharLen(const char *z, int nByte){
@@ -451,10 +451,10 @@ int sqlite3utf8CharLen(const char *z, int nByte){
 
 #ifndef SQLITE_OMIT_UTF16
 /*
-** pZ is a UTF-16 encoded tqunicode string. If nChar is less than zero,
+** pZ is a UTF-16 encoded unicode string. If nChar is less than zero,
 ** return the number of bytes up to (but not including), the first pair
 ** of consecutive 0x00 bytes in pZ. If nChar is not less than zero,
-** then return the number of bytes in the first nChar tqunicode characters
+** then return the number of bytes in the first nChar unicode characters
 ** in pZ (or up until the first pair of 0x00 bytes, whichever comes first).
 */
 int sqlite3utf16ByteLen(const void *zIn, int nChar){
diff --git a/kexi/3rdparty/kexisql3/src/vdbeInt.h b/kexi/3rdparty/kexisql3/src/vdbeInt.h
index 89174271..4c732b09 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeInt.h
+++ b/kexi/3rdparty/kexisql3/src/vdbeInt.h
@@ -133,7 +133,7 @@ typedef struct Mem Mem;
 ** No other flags may be set in this case.
 **
 ** If the MEM_Str flag is set then Mem.z points at a string representation.
-** Usually this is encoded in the same tqunicode encoding as the main
+** Usually this is encoded in the same unicode encoding as the main
 ** database (see below for exceptions). If the MEM_Term flag is also
 ** set, then the string is nul terminated. The MEM_Int and MEM_Real 
 ** flags may coexist with the MEM_Str flag.
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
index 8ea3b0b9..2d1e6b77 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.cpp
@@ -25,18 +25,18 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
     : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
-    m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
+    m_preview = new KoPagePreview( previewPane, "Preview", layout );
     lay->addWidget(m_preview);
     lay = new TQHBoxLayout(columnSpacingPane);
     m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane );
     m_spacing->setValue(  m_columns.ptColumnSpacing );
     m_spacing->setUnit( unit );
     double dStep = KoUnit::fromUserValue( 0.2, unit );
-    m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep );
+    m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep );
     lay->addWidget(m_spacing);
     labelSpacing->setBuddy( m_spacing );
     nColumns->setValue( m_columns.columns );
@@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) {
     emit propertyChange(m_columns);
 }
 
-void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
-    m_preview->setPageLayout( tqlayout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &layout) {
+    m_preview->setPageLayout( layout );
 }
 
 #include <KoPageLayoutColumns.moc>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index 8ebac1b2..b9dcd6c2 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -43,15 +43,15 @@ public:
      * @param parent the parent widget
      * @param columns the KoColumns data structure that this dialog should be initialzed with
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
-     * @param tqlayout the page tqlayout that the preview should be initialzed with.
+     * @param layout the page layout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
 
     /**
-     * Update the page preview widget with the param tqlayout.
-     * @param tqlayout the new tqlayout
+     * Update the page preview widget with the param layout.
+     * @param layout the new layout
      */
-    void setLayout(KoPageLayout &tqlayout);
+    void setLayout(KoPageLayout &layout);
 public slots:
 
     /**
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
index 41246d84..7f36378e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
@@ -45,7 +45,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index a1f65a90..26960701 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -33,9 +33,9 @@
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
     : TQWidget(parent) {
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
 
     TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -129,7 +129,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
 
-    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
+    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
        KDialog::spacingHint() );
 
     // left margin
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 06c08517..8e503551 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -42,13 +42,13 @@ public:
     /**
      * Contructor
      * @param parent the parent widget
-     * @param tqlayout the page tqlayout that this widget should be initialzed with.
+     * @param layout the page layout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
@@ -76,11 +76,11 @@ public slots:
 signals:
     /**
      * Emitted whenever the user changed something in the dialog.
-     * @param tqlayout the update tqlayout structure with currently displayed info.
+     * @param layout the update layout structure with currently displayed info.
      * Note that the info may not be fully correct and physically possible (in which
      * case queryClose will return false)
      */
-    void propertyChange(KoPageLayout &tqlayout);
+    void propertyChange(KoPageLayout &layout);
 
 protected:
     TQComboBox *cpgUnit;
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 682a26d6..316eba19 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -62,7 +62,7 @@ KoGenStyle KoPageLayout::saveOasis() const
 
 void KoPageLayout::loadOasis(const TQDomElement &style)
 {
-    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
+    TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
     if ( !properties.isNull() )
     {
         ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -86,16 +86,16 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
 
 KoPageLayout KoPageLayout::standardLayout()
 {
-    KoPageLayout tqlayout;
-    tqlayout.format = KoPageFormat::defaultFormat();
-    tqlayout.orientation = PG_PORTRAIT;
-    tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
-    tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
-    tqlayout.ptLeft = MM_TO_POINT( 20.0 );
-    tqlayout.ptRight = MM_TO_POINT( 20.0 );
-    tqlayout.ptTop = MM_TO_POINT( 20.0 );
-    tqlayout.ptBottom = MM_TO_POINT( 20.0 ); 
-    return tqlayout;
+    KoPageLayout layout;
+    layout.format = KoPageFormat::defaultFormat();
+    layout.orientation = PG_PORTRAIT;
+    layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
+    layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
+    layout.ptLeft = MM_TO_POINT( 20.0 );
+    layout.ptRight = MM_TO_POINT( 20.0 );
+    layout.ptTop = MM_TO_POINT( 20.0 );
+    layout.ptBottom = MM_TO_POINT( 20.0 ); 
+    return layout;
 }
 
 struct PageFormatInfo
@@ -151,12 +151,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
 {
     if ( format == PG_SCREEN )
     {
-            kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+            kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
             return KPrinter::A4;
     }
     else if ( format == PG_CUSTOM )
     {
-            kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+            kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
             return KPrinter::A4;
     }
     else if ( format <= PG_LAST_FORMAT )
diff --git a/kexi/3rdparty/kolibs/koPageLayout.h b/kexi/3rdparty/kolibs/koPageLayout.h
index 724f9275..eb922846 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.h
+++ b/kexi/3rdparty/kolibs/koPageLayout.h
@@ -156,7 +156,7 @@ enum KoHFType {
 };
 
 /**
- * This structure defines the page tqlayout, including
+ * This structure defines the page layout, including
  * its size in pt, its format (e.g. A4), orientation, unit, margins etc.
  */
 struct KoPageLayout
@@ -193,18 +193,18 @@ struct KoPageLayout
 
 #ifndef SIMPLE_KOLIBS
     /**
-     * Save this page tqlayout to OASIS.
+     * Save this page layout to OASIS.
      */
     KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
 
     /**
-     * Load this page tqlayout from OASIS
+     * Load this page layout from OASIS
      */
     KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
 #endif
 
     /**
-     * @return a page tqlayout with the default page size depending on the locale settings,
+     * @return a page layout with the default page size depending on the locale settings,
      * default margins (2 cm), and portrait orientation.
      * @since 1.4
      */
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index 5bc7f3b3..99d5e01d 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -49,10 +49,10 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
     : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
-    setPageLayout( tqlayout );
+    setPageLayout( layout );
     columns = 1;
     setMinimumSize( 150, 150 );
 }
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
 {
 }
 
-/*=================== set tqlayout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
+/*=================== set layout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &layout )
 {
     // resolution[XY] is in pixel per pt
     double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) );
     double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) );
 
-    m_pageWidth = tqlayout.ptWidth * resolutionX;
-    m_pageHeight = tqlayout.ptHeight * resolutionY;
+    m_pageWidth = layout.ptWidth * resolutionX;
+    m_pageHeight = layout.ptHeight * resolutionY;
 
     double zh = 110.0 / m_pageHeight;
     double zw = 110.0 / m_pageWidth;
@@ -79,15 +79,15 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
     m_pageWidth *= z;
     m_pageHeight *= z;
 
-    m_textFrameX = tqlayout.ptLeft * resolutionX * z;
-    m_textFrameY = tqlayout.ptTop * resolutionY * z;
-    m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
-    m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
+    m_textFrameX = layout.ptLeft * resolutionX * z;
+    m_textFrameY = layout.ptTop * resolutionY * z;
+    m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z;
+    m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z;
 
     repaint( true );
 }
 
-/*=================== set tqlayout =================================*/
+/*=================== set layout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                                  const KoPageLayout& tqlayout,
+                                  const KoPageLayout& layout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
@@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
 
     flags = tabs;
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
     m_pageSizeTab = 0;
     m_columnsTab = 0;
@@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                  const KoPageLayout& tqlayout,
+                  const KoPageLayout& layout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
     flags = tabs;
 
-    m_layout = tqlayout;
+    m_layout = layout;
     m_column = columns;
     m_unit = unit;
     m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         unit = dlg->unit();
     }
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
                                   KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         if ( tabs & COLUMNS ) columns = dlg->columns();
         if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter();
@@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu
     return res;
 }
 
-/*===================== get a standard page tqlayout ===============*/
+/*===================== get a standard page layout ===============*/
 KoPageLayout KoPageLayoutDia::standardLayout()
 {
     return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
             this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
-void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) {
-    m_layout.ptWidth = tqlayout.ptWidth;
-    m_layout.ptHeight = tqlayout.ptHeight;
-    m_layout.ptLeft = tqlayout.ptLeft;
-    m_layout.ptRight = tqlayout.ptRight;
-    m_layout.ptTop = tqlayout.ptTop;
-    m_layout.ptBottom = tqlayout.ptBottom;
-    m_layout.format = tqlayout.format;
-    m_layout.orientation = tqlayout.orientation;
+void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
+    m_layout.ptWidth = layout.ptWidth;
+    m_layout.ptHeight = layout.ptHeight;
+    m_layout.ptLeft = layout.ptLeft;
+    m_layout.ptRight = layout.ptRight;
+    m_layout.ptTop = layout.ptTop;
+    m_layout.ptBottom = layout.ptBottom;
+    m_layout.format = layout.format;
+    m_layout.orientation = layout.orientation;
     if(m_columnsTab)
-        m_columnsTab->setLayout(tqlayout);
+        m_columnsTab->setLayout(layout);
 }
 
 /*================ setup header and footer tab ===================*/
@@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- header ---------------
     TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 );
-    gHead->tqlayout()->setSpacing(KDialog::spacingHint());
-    gHead->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 );
+    gHead->layout()->setSpacing(KDialog::spacingHint());
+    gHead->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
 
     TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead );
     headGrid->addWidget( lHeadLeft, 0, 0 );
@@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- footer ---------------
     TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 );
-    gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
-    gFoot->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 );
+    gFoot->layout()->setSpacing(KDialog::spacingHint());
+    gFoot->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
 
     TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot );
     footGrid->addWidget( lFootLeft, 0, 0 );
@@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3()
     TQWidget *tab3 = addPage(i18n( "Col&umns" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab3);
     m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout);
-    m_columnsTab->tqlayout()->setMargin(0);
+    m_columnsTab->layout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
     connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
@@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf )
     TQWidget *tab4 = addPage(i18n( "H&eader && Footer" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab4);
     m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf);
-    m_headerTab->tqlayout()->setMargin(0);
+    m_headerTab->layout()->setMargin(0);
     lay->addWidget(m_headerTab);
     m_headerTab->show();
 
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.h b/kexi/3rdparty/kolibs/koPageLayoutDia.h
index 21fe7df3..1ed23ec5 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.h
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
     ~KoPagePreview();
 
     /**
-     *  set page tqlayout
+     *  set page layout
      */
     void setPageLayout( const KoPageLayout& );
     void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
 class KoPageLayoutDiaPrivate;
 
 /**
- *  With this dialog the user can specify the tqlayout of the paper during printing.
+ *  With this dialog the user can specify the layout of the paper during printing.
  */
 class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
 {
@@ -92,14 +92,14 @@ public:
      *
      *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
-     *  @param tqlayout   The tqlayout.
+     *  @param layout   The layout.
      *  @param headfoot The header and the footer.
      *  @param flags     a variable with all features this dialog should show.
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
 
@@ -108,7 +108,7 @@ public:
      *
      *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
-     *  @param tqlayout     The tqlayout.
+     *  @param layout     The layout.
      *  @param headfoot   The header and the footer.
      *  @param columns    The number of columns on the page.
      *  @param kwheadfoot The KWord header and footer.
@@ -116,7 +116,7 @@ public:
      *  @param unit       The unit to use for displaying the values to the user
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
              const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
     ~KoPageLayoutDia();
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
-     *  Retrieves a standard page tqlayout.
+     *  Retrieves a standard page layout.
      *  Deprecated: better use KoPageLayout::standardLayout()
      */
     static KDE_DEPRECATED KoPageLayout standardLayout();
 
     /**
-     *  Returns the tqlayout
+     *  Returns the layout
      */
-    const KoPageLayout& tqlayout() const { return m_layout; }
+    const KoPageLayout& layout() const { return m_layout; }
 
     /**
      *  Returns the header and footer information
@@ -177,7 +177,7 @@ private:
     TQLineEdit *eFootMid;
     TQLineEdit *eFootRight;
 
-    // tqlayout
+    // layout
     KoPageLayout m_layout;
     KoColumns m_column;
 
@@ -189,7 +189,7 @@ protected slots:
     virtual void slotOk();
 
 private slots:
-    void sizeUpdated(KoPageLayout &tqlayout);
+    void sizeUpdated(KoPageLayout &layout);
     void columnsUpdated(KoColumns &columns);
 
 private:
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 731c38bd..73a55822 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -378,48 +378,48 @@ double KoUnitDoubleComboBox::value( void ) const
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
     : TQWidget( parent ), m_step( 1.0 )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
     : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 void