Rename obsolete tq methods to standard names

4 files changed, 18 insertions, 18 deletions

diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp
index 622ad995..d7ef0279 100644
--- a/kopete/protocols/irc/ui/channellist.cpp
+++ b/kopete/protocols/irc/ui/channellist.cpp
@@ -118,7 +118,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
 			if ( lv->isEnabled() )
 				how |= TQStyle::Style_Enabled;
 
-			lv->tqstyle().drawComplexControl( TQStyle::CC_ListView,
+			lv->style().drawComplexControl( TQStyle::CC_ListView,
 						p, lv, TQRect( 0, 0, width, height() ), lv->colorGroup(),
 						how, TQStyle::SC_ListView, TQStyle::SC_None,
 						opt );
@@ -143,7 +143,7 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
 				textheight++;
 			if ( textheight < height() ) {
 				int w = lv->treeStepSize() / 2;
-				lv->tqstyle().drawComplexControl( TQStyle::CC_ListView, p, lv,
+				lv->style().drawComplexControl( TQStyle::CC_ListView, p, lv,
 								TQRect( 0, textheight, w + 1, height() - textheight + 1 ), _cg,
 								lv->isEnabled() ? TQStyle::Style_Enabled : TQStyle::Style_Default,
 								TQStyle::SC_ListViewExpand,
@@ -170,21 +170,21 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine )
 {
 	ChannelListLayout = new TQVBoxLayout( this, 11, 6, "ChannelListLayout");
 
-	tqlayout72_2 = new TQHBoxLayout( 0, 0, 6, "tqlayout72_2");
+	layout72_2 = new TQHBoxLayout( 0, 0, 6, "layout72_2");
 
 	textLabel1_2 = new TQLabel( this, "textLabel1_2" );
-	tqlayout72_2->addWidget( textLabel1_2 );
+	layout72_2->addWidget( textLabel1_2 );
 
 	channelSearch = new TQLineEdit( this, "channelSearch" );
-	tqlayout72_2->addWidget( channelSearch );
+	layout72_2->addWidget( channelSearch );
 
 	numUsers = new TQSpinBox( 0, 32767, 1, this, "num_users" );
 	numUsers->setSuffix( i18n(" members") );
-	tqlayout72_2->addWidget( numUsers );
+	layout72_2->addWidget( numUsers );
 
 	mSearchButton = new TQPushButton( this, "mSearchButton" );
-	tqlayout72_2->addWidget( mSearchButton );
-	ChannelListLayout->addLayout( tqlayout72_2 );
+	layout72_2->addWidget( mSearchButton );
+	ChannelListLayout->addLayout( layout72_2 );
 
 	mChannelList = new KListView( this, "mChannelList" );
 	mChannelList->addColumn( i18n( "Channel" ) );
diff --git a/kopete/protocols/irc/ui/channellist.h b/kopete/protocols/irc/ui/channellist.h
index 81c56e1c..1a528bb9 100644
--- a/kopete/protocols/irc/ui/channellist.h
+++ b/kopete/protocols/irc/ui/channellist.h
@@ -69,7 +69,7 @@ class ChannelList
 		TQPushButton* mSearchButton;
 		KListView* mChannelList;
 		TQVBoxLayout* ChannelListLayout;
-		TQHBoxLayout* tqlayout72_2;
+		TQHBoxLayout* layout72_2;
 		KIRC::Engine *m_engine;
 		bool mSearching;
 		TQString mSearch;
diff --git a/kopete/protocols/irc/ui/ircadd.ui b/kopete/protocols/irc/ui/ircadd.ui
index 3c417075..a85681cd 100644
--- a/kopete/protocols/irc/ui/ircadd.ui
+++ b/kopete/protocols/irc/ui/ircadd.ui
@@ -45,7 +45,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout70</cstring>
+                            <cstring>layout70</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui
index f04c8e09..c184b92e 100644
--- a/kopete/protocols/irc/ui/irceditaccount.ui
+++ b/kopete/protocols/irc/ui/irceditaccount.ui
@@ -261,7 +261,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout21</cstring>
+                            <cstring>layout21</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -269,7 +269,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout19</cstring>
+                                    <cstring>layout19</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -304,7 +304,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout20</cstring>
+                                    <cstring>layout20</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -395,7 +395,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout25</cstring>
+                                    <cstring>layout25</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -554,7 +554,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout19</cstring>
+                                    <cstring>layout19</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -646,7 +646,7 @@
                             </widget>
                             <widget class="TQLayoutWidget" row="0" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout23</cstring>
+                                    <cstring>layout23</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -809,7 +809,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout153</cstring>
+                                    <cstring>layout153</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -886,7 +886,7 @@
                             </property>
                             <widget class="TQLayoutWidget" row="1" column="0">
                                 <property name="name">
-                                    <cstring>tqlayout29</cstring>
+                                    <cstring>layout29</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">