Rename old tq methods that no longer need a unique name

7 files changed, 31 insertions, 31 deletions

diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
index 325fe45e..07cced25 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
@@ -56,7 +56,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
index b3bd7978..41246d84 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
@@ -61,7 +61,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -187,7 +187,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index 649f4c26..ce6f8f3b 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -159,9 +159,9 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     // ------------- spacers -----------
     TQWidget* spacer1 = new TQWidget( this );
     TQWidget* spacer2 = new TQWidget( this );
-    spacer1->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer1->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
-    spacer2->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    spacer2->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
        TQSizePolicy::Expanding ) );
     grid1->addWidget( spacer1, 4, 0 );
     grid1->addWidget( spacer2, 4, 1 );
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index 3541e6ea..a88e3bcd 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cc
@@ -133,7 +133,7 @@ void KoGlobal::createListOfLanguages()
     // currently have en_GB or en_US etc.
 
     const TQStringList translationList = KGlobal::dirs()->findAllResources("locale",
-                                                            TQString::tqfromLatin1("*/entry.desktop"));
+                                                            TQString::fromLatin1("*/entry.desktop"));
     for ( TQStringList::ConstIterator it = translationList.begin();
           it != translationList.end(); ++it )
     {
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index 7888ba7d..682a26d6 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -200,15 +200,15 @@ KoFormat KoPageFormat::guessFormat( double width, double height )
 TQString KoPageFormat::formatString( KoFormat format )
 {
     if ( format <= PG_LAST_FORMAT )
-        return TQString::tqfromLatin1( pageFormatInfo[ format ].shortName );
-    return TQString::tqfromLatin1( "A4" );
+        return TQString::fromLatin1( pageFormatInfo[ format ].shortName );
+    return TQString::fromLatin1( "A4" );
 }
 
 KoFormat KoPageFormat::formatFromString( const TQString & string )
 {
     for ( int i = 0 ; i <= PG_LAST_FORMAT ; ++i )
     {
-        if (string == TQString::tqfromLatin1( pageFormatInfo[ i ].shortName ))
+        if (string == TQString::fromLatin1( pageFormatInfo[ i ].shortName ))
             return pageFormatInfo[ i ].format;
     }
     // We do not know the format name, so we have a custom format
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index 506e24e1..e8dd16ff 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cc
@@ -185,15 +185,15 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 {
     if ( ok )
         *ok = true;
-    if ( _unitName == TQString::tqfromLatin1( "mm" ) ) return U_MM;
-    if ( _unitName == TQString::tqfromLatin1( "cm" ) ) return U_CM;
-    if ( _unitName == TQString::tqfromLatin1( "dm" ) ) return U_DM;
-    if ( _unitName == TQString::tqfromLatin1( "in" )
-         || _unitName == TQString::tqfromLatin1("inch") /*compat*/ ) return U_INCH;
-    if ( _unitName == TQString::tqfromLatin1( "pi" ) ) return U_PI;
-    if ( _unitName == TQString::tqfromLatin1( "dd" ) ) return U_DD;
-    if ( _unitName == TQString::tqfromLatin1( "cc" ) ) return U_CC;
-    if ( _unitName == TQString::tqfromLatin1( "pt" ) ) return U_PT;
+    if ( _unitName == TQString::fromLatin1( "mm" ) ) return U_MM;
+    if ( _unitName == TQString::fromLatin1( "cm" ) ) return U_CM;
+    if ( _unitName == TQString::fromLatin1( "dm" ) ) return U_DM;
+    if ( _unitName == TQString::fromLatin1( "in" )
+         || _unitName == TQString::fromLatin1("inch") /*compat*/ ) return U_INCH;
+    if ( _unitName == TQString::fromLatin1( "pi" ) ) return U_PI;
+    if ( _unitName == TQString::fromLatin1( "dd" ) ) return U_DD;
+    if ( _unitName == TQString::fromLatin1( "cc" ) ) return U_CC;
+    if ( _unitName == TQString::fromLatin1( "pt" ) ) return U_PT;
     if ( ok )
         *ok = false;
     return U_PT;
@@ -201,14 +201,14 @@ KoUnit::Unit KoUnit::unit( const TQString &_unitName, bool* ok )
 
 TQString KoUnit::unitName( Unit _unit )
 {
-    if ( _unit == U_MM ) return TQString::tqfromLatin1( "mm" );
-    if ( _unit == U_CM ) return TQString::tqfromLatin1( "cm" );
-    if ( _unit == U_DM ) return TQString::tqfromLatin1( "dm" );
-    if ( _unit == U_INCH ) return TQString::tqfromLatin1( "in" );
-    if ( _unit == U_PI ) return TQString::tqfromLatin1( "pi" );
-    if ( _unit == U_DD ) return TQString::tqfromLatin1( "dd" );
-    if ( _unit == U_CC ) return TQString::tqfromLatin1( "cc" );
-    return TQString::tqfromLatin1( "pt" );
+    if ( _unit == U_MM ) return TQString::fromLatin1( "mm" );
+    if ( _unit == U_CM ) return TQString::fromLatin1( "cm" );
+    if ( _unit == U_DM ) return TQString::fromLatin1( "dm" );
+    if ( _unit == U_INCH ) return TQString::fromLatin1( "in" );
+    if ( _unit == U_PI ) return TQString::fromLatin1( "pi" );
+    if ( _unit == U_DD ) return TQString::fromLatin1( "dd" );
+    if ( _unit == U_CC ) return TQString::fromLatin1( "cc" );
+    return TQString::fromLatin1( "pt" );
 }
 
 #ifndef SIMPLE_KOLIBS
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 16ec9a55..2b4b76b7 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -222,7 +222,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, const char *name )
     : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ),
     m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    tqsetAlignment( TQt::AlignRight );
+    setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -234,7 +234,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( TQWidget *parent, double lower, doub
     : KLineEdit( parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
     m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    tqsetAlignment( TQt::AlignRight );
+    setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     setValidator( m_validator );
     setUnit( unit );
@@ -286,7 +286,7 @@ double KoUnitDoubleLineEdit::value( void ) const
 KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name )
      : KComboBox( true, parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 )
 {
-    lineEdit()->tqsetAlignment( TQt::AlignRight );
+    lineEdit()->setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( KoUnit::U_PT );
@@ -299,7 +299,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub
      : KComboBox( true, parent, name ), KoUnitDoubleBase( unit, precision ), m_value( value ), m_lower( lower ), m_upper( upper ),
      m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    lineEdit()->tqsetAlignment( TQt::AlignRight );
+    lineEdit()->setAlignment( TQt::AlignRight );
     m_validator = new KoUnitDoubleValidator( this, this );
     lineEdit()->setValidator( m_validator );
     setUnit( unit );