Rename obsolete tq methods to standard names

7 files changed, 22 insertions, 22 deletions

diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index b03cfb8f8..570292013 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -37,7 +37,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 20c474a44..5a49f134d 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -80,7 +80,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
   TQVBoxLayout * vlay = new TQVBoxLayout( top, 0, spacingHint() );
 
   group = new TQVGroupBox( i18n("WatchGnuPG"), top );
-  group->tqlayout()->setSpacing( spacingHint() );
+  group->layout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
@@ -116,7 +116,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name )
 
   /******************* Log Window group *******************/
   group = new TQVGroupBox( i18n("Log Window"), top );
-  group->tqlayout()->setSpacing( spacingHint() );
+  group->layout()->setSpacing( spacingHint() );
 
   w = new TQWidget( group );
 
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 685d241bc..774302ba7 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) {
     TQString result;
     for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) {
         const TQChar ch = s[i];
-        switch ( ch.tqunicode() ) {
+        switch ( ch.unicode() ) {
         case ',':
         case '+':
         case '"':
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index d1f6f0aca..1fdbc9e04 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -124,7 +124,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
       dialogHeight = 400;
     TQSize sz = scrollView->sizeHint();
     scrollView->setMinimumSize( sz.width()
-                                + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
+                                + scrollView->style().pixelMetric(TQStyle::PM_ScrollBarExtent),
                                 TQMIN( compGUI->sizeHint().height(), dialogHeight ) );
   }
   if ( mComponentGUIs.empty() ) {
diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h
index 65cae2499..0c5f0087b 100644
--- a/certmanager/lib/ui/cryptoconfigmodule_p.h
+++ b/certmanager/lib/ui/cryptoconfigmodule_p.h
@@ -82,7 +82,7 @@ namespace Kleo {
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
-                          TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 );
+                          TQGridLayout * layout, TQWidget* parent, const char* name = 0 );
 
     bool save();
     void load();
@@ -102,7 +102,7 @@ namespace Kleo {
     static CryptoConfigEntryGUI* createEntryGUI(
       CryptoConfigModule* module,
       Kleo::CryptoConfigEntry* entry, const TQString& entryName,
-      TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 );
+      TQGridLayout * layout, TQWidget* widget, const char* name = 0 );
   };
 
   /**
@@ -154,7 +154,7 @@ namespace Kleo {
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * tqlayout,
+                               TQGridLayout * layout,
                                TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -174,7 +174,7 @@ namespace Kleo {
     CryptoConfigEntryPath( CryptoConfigModule* module,
                            Kleo::CryptoConfigEntry* entry,
                            const TQString& entryName,
-                           TQGridLayout * tqlayout,
+                           TQGridLayout * layout,
                            TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -194,7 +194,7 @@ namespace Kleo {
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * tqlayout,
+                              TQGridLayout * layout,
                               TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -214,7 +214,7 @@ namespace Kleo {
     CryptoConfigEntryURL( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
                           const TQString& entryName,
-                          TQGridLayout * tqlayout,
+                          TQGridLayout * layout,
                           TQWidget* parent, const char* name = 0 );
 
     virtual void doSave();
@@ -234,7 +234,7 @@ namespace Kleo {
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * tqlayout,
+                              TQGridLayout * layout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -254,7 +254,7 @@ namespace Kleo {
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
                                Kleo::CryptoConfigEntry* entry,
                                const TQString& entryName,
-                               TQGridLayout * tqlayout,
+                               TQGridLayout * layout,
                                TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
@@ -273,7 +273,7 @@ namespace Kleo {
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,
                               Kleo::CryptoConfigEntry* entry,
                               const TQString& entryName,
-                              TQGridLayout * tqlayout,
+                              TQGridLayout * layout,
                               TQWidget* parent, const char* name = 0 );
     virtual void doSave();
     virtual void doLoad();
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 016712ebd..fcc7d493c 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -44,7 +44,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates.
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates.
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index c901a2fd1..a053c9923 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() {
     qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() );
     if ( mLenVisible ) { // but do we also have a visible label?
       TQRect r = rect();
-      const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+      const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
       if( va & AlignVCenter )
         r.setTop( fm.height() / 2 );		// frame rect should be
       else if( va & AlignTop )
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
         x = 0;
     }
     TQRect r( x, 0, tw, h );
-    int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+    int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
     if ( va & AlignTop )
       r.moveBy( 0, fm.descent() );
-    const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
-    if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+    const TQColor pen( (TQRgb) style().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+    if ( !style().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
       va |= NoAccel;
-    tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
+    style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
   }