Rename obsolete tq methods to standard names

(cherry picked from commit 0712de864d)

src/bookmarksdlg.cpp

@@ -45,7 +45,7 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent,
 	setSizeGripEnabled(TRUE);
 	BookmarksDlgLayout = new TQVBoxLayout( this, 11, 6, "BookmarksDlgLayout");
 
-	tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
+	layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
 
 	bookmarksTable = new TQTable(3, 2, this, "bookmarksList" );
 	bookmarksTable->horizontalHeader()->setLabel(0, "Title");
@@ -53,19 +53,19 @@ BookmarksDlg::BookmarksDlg(const Bookmarks& bms, TQWidget* parent,
 // 	bookmarksTable->setLeftMargin(0);
 	bookmarksTable->setColumnStretchable(0, true);
 	bookmarksTable->setSelectionMode(TQTable::SingleRow);
-	tqlayout3->addWidget( bookmarksTable );
+	layout3->addWidget( bookmarksTable );
 
-	tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
+	layout2 = new TQVBoxLayout( 0, 0, 6, "layout2");
 
 	addButton = new TQPushButton( this, "addButton" );
-	tqlayout2->addWidget( addButton );
+	layout2->addWidget( addButton );
 
 	deleteButton = new TQPushButton( this, "deleteButton" );
-	tqlayout2->addWidget( deleteButton );
+	layout2->addWidget( deleteButton );
 	Horizontal_Spacing2_2 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-	tqlayout2->addItem( Horizontal_Spacing2_2 );
-	tqlayout3->addLayout( tqlayout2 );
-	BookmarksDlgLayout->addLayout( tqlayout3 );
+	layout2->addItem( Horizontal_Spacing2_2 );
+	layout3->addLayout( layout2 );
+	BookmarksDlgLayout->addLayout( layout3 );
 
 	Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1");
 

src/bookmarksdlg.h

@@ -53,8 +53,8 @@ public:
 
 protected:
 	TQVBoxLayout* BookmarksDlgLayout;
-	TQHBoxLayout* tqlayout3;
-	TQVBoxLayout* tqlayout2;
+	TQHBoxLayout* layout3;
+	TQVBoxLayout* layout2;
 	TQSpacerItem* Horizontal_Spacing2_2;
 	TQHBoxLayout* Layout1;
 	TQSpacerItem* Horizontal_Spacing2;

src/settingsdlg.ui

@@ -41,7 +41,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -67,7 +67,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -93,7 +93,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">