summaryrefslogtreecommitdiffstats
path: root/parts/grepview
diff options
context:
space:
mode:
Diffstat (limited to 'parts/grepview')
-rw-r--r--parts/grepview/grepdlg.cpp44
-rw-r--r--parts/grepview/grepviewpart.cpp4
-rw-r--r--parts/grepview/grepviewwidget.cpp6
3 files changed, 27 insertions, 27 deletions
diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp
index 18849f40..40d4ec85 100644
--- a/parts/grepview/grepdlg.cpp
+++ b/parts/grepview/grepdlg.cpp
@@ -11,7 +11,7 @@
#include "grepdlg.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
#include <tqhbox.h>
@@ -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,22 +118,22 @@ 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 ));
search_opts_layout->addWidget(regexp_box);
case_sens_box = new TQCheckBox(i18n("C&ase sensitive"), this);
- case_sens_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ case_sens_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
case_sens_box->setChecked(config->readBoolEntry("case_sens", true));
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,27 +158,27 @@ 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));
dir_opts_layout->addWidget(recursive_box);
use_project_box = new TQCheckBox(i18n("Limit search to &project files"), this);
- use_project_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ use_project_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
use_project_box->setChecked(config->readBoolEntry("search_project_files", true));
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,22 +191,22 @@ 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));
other_opts_layout->addWidget(keep_output_box);
no_find_err_box = new TQCheckBox(i18n("&Suppress find errors"), this);
- no_find_err_box->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+ no_find_err_box->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
no_find_err_box->setChecked(config->readBoolEntry("no_find_errs", true));
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);
@@ -214,7 +214,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name
button_layout->addWidget(search_button);
button_layout->addWidget(done_button);
- resize(tqsizeHint());
+ resize(sizeHint());
TQWhatsThis::add(pattern_combo,
i18n("<qt>Enter the regular expression you want to search for here.<p>"
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 997723c1..11ffbd77 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -116,9 +116,9 @@ void GrepViewPart::contextMenu(TQPopupMenu *popup, const Context *context)
if (!ident.isEmpty()) {
m_popupstr = ident;
TQString squeezed = KStringHandler::csqueeze(ident, 30);
- int id = popup->insertItem( i18n("Grep: %1").tqarg(squeezed),
+ int id = popup->insertItem( i18n("Grep: %1").arg(squeezed),
this, TQT_SLOT(slotContextGrep()) );
- popup->tqsetWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
+ popup->setWhatsThis(id, i18n("<b>Grep</b><p>Opens the find in files dialog "
"and sets the pattern to the text under the cursor."));
popup->insertSeparator();
}
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index b0cd9968..fedd038c 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
#include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqregexp.h>
#include <tqpainter.h>
#include <tqtoolbutton.h>
@@ -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);