Rename obsolete tq methods to standard names

3 files changed, 20 insertions, 20 deletions

diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index 91ff6df4..e0af9850 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -43,7 +43,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -51,7 +51,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -125,7 +125,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout23</cstring>
+                        <cstring>layout23</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -179,7 +179,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout24</cstring>
+                <cstring>layout24</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp
index 693c165a..9d37d840 100644
--- a/kig/modes/linkslabel.cpp
+++ b/kig/modes/linkslabel.cpp
@@ -33,7 +33,7 @@ using namespace std;
 class LinksLabel::Private
 {
 public:
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
   std::vector<TQLabel*> labels;
   std::vector<KURLLabel*> urllabels;
 };
@@ -42,22 +42,22 @@ LinksLabel::LinksLabel( TQWidget* parent, const char* name )
   : TQWidget( parent, name )
 {
   p = new Private;
-  p->tqlayout = new TQHBoxLayout( this );
+  p->layout = new TQHBoxLayout( this );
 
   TQLabel* l = new TQLabel( TQString::fromUtf8( "Dit is een " ), this );
   p->labels.push_back( l );
-  p->tqlayout->addWidget( l );
+  p->layout->addWidget( l );
 
   KURLLabel* u = new KURLLabel( TQString::fromUtf8( "http://www.kde.org/" ),
                                 TQString::fromUtf8( "url"), this );
   p->urllabels.push_back( u );
-  p->tqlayout->addWidget( u );
+  p->layout->addWidget( u );
 
   l = new TQLabel( TQString::fromUtf8( " !" ), this );
   p->labels.push_back( l );
-  p->tqlayout->addWidget(l );
+  p->layout->addWidget(l );
 
-  p->tqlayout->activate();
+  p->layout->activate();
 }
 
 LinksLabel::~LinksLabel()
@@ -99,8 +99,8 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
   p->urllabels.clear();
   p->labels.clear();
 
-  delete p->tqlayout;
-  p->tqlayout = new TQHBoxLayout( this );
+  delete p->layout;
+  p->layout = new TQHBoxLayout( this );
 
   for ( LinksLabelEditBuf::vec::iterator i = buf.data.begin(); i != buf.data.end(); ++i )
   {
@@ -111,7 +111,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
       KURLLabel* l = new KURLLabel( TQString::fromUtf8( "http://edu.kde.org/kig" ),
                                     i->second, this );
       p->urllabels.push_back( l );
-      p->tqlayout->addWidget( l );
+      p->layout->addWidget( l );
       connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) );
     }
     else
@@ -119,15 +119,15 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
       // we need a normal label...
       TQLabel* l = new TQLabel( i->second, this );
       p->labels.push_back( l );
-      p->tqlayout->addWidget( l );
+      p->layout->addWidget( l );
     };
   };
 
   TQSpacerItem* spacer = new TQSpacerItem( 40,  20,  TQSizePolicy::Expanding,  TQSizePolicy::Minimum );
 
-  p->tqlayout->addItem( spacer );
+  p->layout->addItem( spacer );
 
-  p->tqlayout->activate();
+  p->layout->activate();
 
   std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fun( &TQWidget::show ) );
   std::for_each( p->labels.begin(), p->labels.end(), mem_fun( &TQWidget::show ) );
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 347eb831..90216532 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -30,7 +30,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -90,7 +90,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -98,7 +98,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -147,7 +147,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">