Rename obsolete tq methods to standard names

(cherry picked from commit abcbb684982167791304dc2fe0bc979489506b43)

2 files changed, 19 insertions, 19 deletions

diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 98f50d65..6dfa16b9 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -88,25 +88,25 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     config = GrepViewFactory::instance()->config();
     config->setGroup("GrepDialog");
 
-    TQGridLayout *tqlayout = new TQGridLayout(this, 9, 2, 10, 4);
-    tqlayout->setColStretch(0, 0);
-    tqlayout->setColStretch(1, 20);
+    TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4);
+    layout->setColStretch(0, 0);
+    layout->setColStretch(1, 20);
 
     TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this);
-    tqlayout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
+    layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter);
 
     pattern_combo = new KHistoryCombo(true, this);
     pattern_label->setBuddy(pattern_combo);
     pattern_combo->setFocus();
     pattern_combo->setHistoryItems(config->readListEntry("LastSearchItems"), true);
     pattern_combo->setInsertionPolicy(TQComboBox::NoInsertion);
-    tqlayout->addWidget(pattern_combo, 0, 1);
+    layout->addWidget(pattern_combo, 0, 1);
 
     TQLabel *template_label = new TQLabel(i18n("&Template:"), this);
-    tqlayout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
+    layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter);
 
     TQBoxLayout *template_layout = new TQHBoxLayout(4);
-    tqlayout->addLayout(template_layout, 1, 1);
+    layout->addLayout(template_layout, 1, 1);
 
     template_edit = new KLineEdit(this);
     template_label->setBuddy(template_edit);
@@ -118,7 +118,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     template_layout->addWidget(template_combo, 0);
 
     TQBoxLayout *search_opts_layout = new TQHBoxLayout(15);
-    tqlayout->addLayout(search_opts_layout, 2, 1);
+    layout->addLayout(search_opts_layout, 2, 1);
 
     regexp_box = new TQCheckBox(i18n("&Regular Expression"), this);
     regexp_box->setChecked(config->readBoolEntry("regexp", false ));
@@ -130,10 +130,10 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     search_opts_layout->addWidget(case_sens_box);
 
     TQLabel *dir_label = new TQLabel(i18n("&Directory:"), this);
-    tqlayout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
+    layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter);
 
     TQBoxLayout *dir_layout = new TQHBoxLayout(4);
-    tqlayout->addLayout(dir_layout, 3, 1);
+    layout->addLayout(dir_layout, 3, 1);
 
     dir_combo = new KComboBox( true, this );
     dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths"));
@@ -158,7 +158,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     dir_layout->addWidget( synch_button );
 
     TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15);
-    tqlayout->addLayout(dir_opts_layout, 4, 1);
+    layout->addLayout(dir_opts_layout, 4, 1);
 
     recursive_box = new TQCheckBox(i18n("Rec&ursive"), this);
     recursive_box->setChecked(config->readBoolEntry("recursive", true));
@@ -170,15 +170,15 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     dir_opts_layout->addWidget(use_project_box);
 
     TQLabel *files_label = new TQLabel(i18n("&Files:"), this);
-    tqlayout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
+    layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter);
 
     files_combo = new KComboBox(true, this);
     files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy()));
     files_combo->insertStrList(filepatterns);
-    tqlayout->addWidget(files_combo, 5, 1);
+    layout->addWidget(files_combo, 5, 1);
 
     TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this);
-    tqlayout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
+    layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter);
 
     TQStringList exclude_list = config->readListEntry("exclude_patterns");
     exclude_combo = new KComboBox(true, this);
@@ -191,10 +191,10 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
         exclude_combo->insertItem("/CVS/,/SCCS/,/\\.svn/,/_darcs/");
         exclude_combo->insertItem("");
     }
-    tqlayout->addWidget(exclude_combo, 6, 1);
+    layout->addWidget(exclude_combo, 6, 1);
 
     TQBoxLayout *other_opts_layout = new TQHBoxLayout(15);
-    tqlayout->addLayout(other_opts_layout, 7, 1);
+    layout->addLayout(other_opts_layout, 7, 1);
 
     keep_output_box = new TQCheckBox(i18n("New view"), this);
     keep_output_box->setChecked(config->readBoolEntry("new_view", true));
@@ -206,7 +206,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
     other_opts_layout->addWidget(no_find_err_box);
 
     TQBoxLayout *button_layout = new TQHBoxLayout(4);
-    tqlayout->addLayout(button_layout, 8, 1);
+    layout->addLayout(button_layout, 8, 1);
     search_button = new KPushButton(KGuiItem(i18n("Sea&rch"),"grep"), this);
     search_button->setDefault(true);
     KPushButton *done_button = new KPushButton(KStdGuiItem::cancel(), this);
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index be31174f..75a53fc9 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -73,7 +73,7 @@ void GrepListBoxItem::paint(TQPainter *p)
 {
 	TQColor base, dim, result, bkground;
 	if (listBox()) {
-		const TQColorGroup& group = listBox()->tqpalette().active();
+		const TQColorGroup& group = listBox()->palette().active();
 		if (isSelected()) {
 			bkground = group.button();
 			base = group.buttonText();
@@ -126,7 +126,7 @@ void GrepListBoxItem::paint(TQPainter *p)
 
 GrepViewWidget::GrepViewWidget(GrepViewPart *part) :  TQWidget(0, "grepview widget")
 {
-	m_layout = new TQHBoxLayout(this, 0, -1, "greptqlayout");
+	m_layout = new TQHBoxLayout(this, 0, -1, "greplayout");
 
 	m_tabWidget = new KTabWidget(this);