From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- parts/grepview/grepdlg.cpp | 54 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'parts/grepview/grepdlg.cpp') diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 80264a92..80c06c8b 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -80,33 +80,33 @@ const char *filepatterns[] = { }; -GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name ) - : TQDialog(parent, name, false), m_part( part ) +GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *tqparent, const char *name ) + : TQDialog(tqparent, name, false), m_part( part ) { setCaption(i18n("Find in Files")); config = GrepViewFactory::instance()->config(); config->setGroup("GrepDialog"); - TQGridLayout *layout = new TQGridLayout(this, 9, 2, 10, 4); - layout->setColStretch(0, 0); - layout->setColStretch(1, 20); + TQGridLayout *tqlayout = new TQGridLayout(this, 9, 2, 10, 4); + tqlayout->setColStretch(0, 0); + tqlayout->setColStretch(1, 20); TQLabel *pattern_label = new TQLabel(i18n("&Pattern:"), this); - layout->addWidget(pattern_label, 0, 0, AlignRight | AlignVCenter); + tqlayout->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); - layout->addWidget(pattern_combo, 0, 1); + tqlayout->addWidget(pattern_combo, 0, 1); TQLabel *template_label = new TQLabel(i18n("&Template:"), this); - layout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(template_label, 1, 0, AlignRight | AlignVCenter); TQBoxLayout *template_layout = new TQHBoxLayout(4); - layout->addLayout(template_layout, 1, 1); + tqlayout->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); - layout->addLayout(search_opts_layout, 2, 1); + tqlayout->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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + case_sens_box->tqsetSizePolicy(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); - layout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(dir_label, 3, 0, AlignRight | AlignVCenter); TQBoxLayout *dir_layout = new TQHBoxLayout(4); - layout->addLayout(dir_layout, 3, 1); + tqlayout->addLayout(dir_layout, 3, 1); dir_combo = new KComboBox( true, this ); dir_combo->insertStringList(config->readPathListEntry("LastSearchPaths")); @@ -158,31 +158,31 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name dir_layout->addWidget( synch_button ); TQBoxLayout *dir_opts_layout = new TQHBoxLayout(15); - layout->addLayout(dir_opts_layout, 4, 1); + tqlayout->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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + use_project_box->tqsetSizePolicy(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); - layout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(files_label, 5, 0, AlignRight | AlignVCenter); files_combo = new KComboBox(true, this); - files_label->setBuddy(files_combo->focusProxy()); + files_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); files_combo->insertStrList(filepatterns); - layout->addWidget(files_combo, 5, 1); + tqlayout->addWidget(files_combo, 5, 1); TQLabel *exclude_label = new TQLabel(i18n("&Exclude:"), this); - layout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter); + tqlayout->addWidget(exclude_label, 6, 0, AlignRight | AlignVCenter); TQStringList exclude_list = config->readListEntry("exclude_patterns"); exclude_combo = new KComboBox(true, this); - exclude_label->setBuddy(files_combo->focusProxy()); + exclude_label->setBuddy(TQT_TQWIDGET(files_combo->focusProxy())); if (exclude_list.count()) { exclude_combo->insertStringList(exclude_list); } @@ -191,22 +191,22 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name exclude_combo->insertItem("/CVS/,/SCCS/,/\\.svn/,/_darcs/"); exclude_combo->insertItem(""); } - layout->addWidget(exclude_combo, 6, 1); + tqlayout->addWidget(exclude_combo, 6, 1); TQBoxLayout *other_opts_layout = new TQHBoxLayout(15); - layout->addLayout(other_opts_layout, 7, 1); + tqlayout->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->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed); + no_find_err_box->tqsetSizePolicy(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); - layout->addLayout(button_layout, 8, 1); + tqlayout->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(sizeHint()); + resize(tqsizeHint()); TQWhatsThis::add(pattern_combo, i18n("Enter the regular expression you want to search for here.

" @@ -261,7 +261,7 @@ GrepDialog::GrepDialog( GrepViewPart * part, TQWidget *parent, const char *name slotPatternChanged( pattern_combo->currentText() ); } -// Returns the contents of a TQComboBox as a QStringList +// Returns the contents of a TQComboBox as a TQStringList static TQStringList qCombo2StringList( TQComboBox* combo ) { TQStringList list; @@ -345,7 +345,7 @@ void GrepDialog::slotSearchClicked() void GrepDialog::show() { // not beautiful, but works with all window - // managers and Qt versions + // managers and TQt versions if (isVisible()) hide(); // TQDialog::hide(); -- cgit v1.2.1