summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:04:41 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-25 03:58:18 +0200
commit4a59b684a13ec62b5ce09ca6dab395275c813526 (patch)
tree7bb13c7e4d45414ce1f46edcdc842a8d91907ec6
parentb93a81846853107e117bbd19cb4b05f73962b80e (diff)
downloadkile-4a59b684a13ec62b5ce09ca6dab395275c813526.tar.gz
kile-4a59b684a13ec62b5ce09ca6dab395275c813526.zip
Rename obsolete tq methods to standard names
(cherry picked from commit 18ee04827d8fcae2ecdf14ee484e08ff20f144f3)
-rw-r--r--src/kile/cleandialog.cpp8
-rw-r--r--src/kile/codecompletion.cpp2
-rw-r--r--src/kile/configcheckerdlg.cpp4
-rw-r--r--src/kile/configcodecompletion.cpp10
-rw-r--r--src/kile/configstructure.cpp6
-rw-r--r--src/kile/envconfigwidget.ui2
-rw-r--r--src/kile/floatdialog.cpp36
-rw-r--r--src/kile/generalconfigwidget.ui2
-rw-r--r--src/kile/includegraphicsdialog.cpp2
-rw-r--r--src/kile/kiledocumentinfo.cpp2
-rw-r--r--src/kile/kileedit.cpp6
-rw-r--r--src/kile/kilegrepdialog.cpp56
-rw-r--r--src/kile/kilehelp.cpp2
-rw-r--r--src/kile/kilejscript.cpp2
-rw-r--r--src/kile/kilelistselector.cpp8
-rw-r--r--src/kile/kilemultitabbar.cpp4
-rw-r--r--src/kile/kileprojectdlgs.cpp22
-rw-r--r--src/kile/kilesidebar.cpp14
-rw-r--r--src/kile/kilestatsdlg.cpp4
-rw-r--r--src/kile/kilestatswidget.cpp70
-rw-r--r--src/kile/kilestatswidget.h4
-rw-r--r--src/kile/kilestdactions.cpp2
-rw-r--r--src/kile/kilestructurewidget.cpp2
-rw-r--r--src/kile/kiletoolconfigwidget.cpp2
-rw-r--r--src/kile/kileviewmanager.cpp4
-rw-r--r--src/kile/latexcmddialog.cpp2
-rw-r--r--src/kile/mathenvdialog.cpp48
-rw-r--r--src/kile/newdocumentwidget.ui2
-rw-r--r--src/kile/previewconfigwidget.cpp18
-rw-r--r--src/kile/quickdocumentdialog.cpp2
-rw-r--r--src/kile/scriptingconfigwidget.ui2
-rw-r--r--src/kile/symbolviewconfig.ui4
-rw-r--r--src/kile/tabulardialog.cpp138
-rw-r--r--src/kile/texdocdialog.cpp6
-rw-r--r--src/kile/userhelpdialog.cpp4
35 files changed, 251 insertions, 251 deletions
diff --git a/src/kile/cleandialog.cpp b/src/kile/cleandialog.cpp
index b0d5680..180f329 100644
--- a/src/kile/cleandialog.cpp
+++ b/src/kile/cleandialog.cpp
@@ -39,15 +39,15 @@ namespace KileDialog
// label widgets
TQWidget *labelwidget = new TQWidget(plainPage());
- TQHBoxLayout *labeltqlayout = new TQHBoxLayout(labelwidget);
+ TQHBoxLayout *labellayout = new TQHBoxLayout(labelwidget);
// line 1: picture and label
TQLabel *picture = new TQLabel("", labelwidget);
picture->setPixmap( KGlobal::instance()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium) );
TQLabel *label = new TQLabel(i18n( "Do you really want to delete these files?" ), labelwidget);
- labeltqlayout->addWidget(picture);
- labeltqlayout->addSpacing(20);
- labeltqlayout->addWidget(label);
+ labellayout->addWidget(picture);
+ labellayout->addSpacing(20);
+ labellayout->addWidget(label);
// line 2: listview
listview = new KListView(plainPage());
diff --git a/src/kile/codecompletion.cpp b/src/kile/codecompletion.cpp
index f8225f2..792d905 100644
--- a/src/kile/codecompletion.cpp
+++ b/src/kile/codecompletion.cpp
@@ -852,7 +852,7 @@ namespace KileDocument
TQString CodeCompletion::stripParameter( const TQString &text )
{
TQString s = "";
- const TQChar *ch = text.tqunicode();
+ const TQChar *ch = text.unicode();
bool ignore = false;
diff --git a/src/kile/configcheckerdlg.cpp b/src/kile/configcheckerdlg.cpp
index af6d285..161640c 100644
--- a/src/kile/configcheckerdlg.cpp
+++ b/src/kile/configcheckerdlg.cpp
@@ -74,9 +74,9 @@ ConfigChecker::ConfigChecker(TQWidget* parent) :
KDialogBase( Plain, i18n("System Check"), Ok|Cancel|User1, Ok, parent, 0, true, true, KGuiItem("&Save Results...")),
m_tester(0L)
{
- TQGridLayout *tqlayout = new TQGridLayout(plainPage(), 1, 1);
+ TQGridLayout *layout = new TQGridLayout(plainPage(), 1, 1);
m_widget = new ConfigCheckerWidget(plainPage());
- tqlayout->addWidget(m_widget, 1, 1);
+ layout->addWidget(m_widget, 1, 1);
enableButton(Ok, false);
enableButton(User1, false);
diff --git a/src/kile/configcodecompletion.cpp b/src/kile/configcodecompletion.cpp
index 9bd7abf..6ddb0a1 100644
--- a/src/kile/configcodecompletion.cpp
+++ b/src/kile/configcodecompletion.cpp
@@ -70,9 +70,9 @@ ConfigCodeCompletion::ConfigCodeCompletion(KConfig *config, KileWidget::LogMsg *
// below: OptionBox
TQButtonGroup *bg_options = new TQButtonGroup( this, "bgOptions" );
bg_options->setColumnLayout(0, Qt::Vertical );
- bg_options->tqlayout()->setSpacing( 6 );
- bg_options->tqlayout()->setMargin( 11 );
- TQGridLayout *bg_optionsLayout = new TQGridLayout( bg_options->tqlayout() );
+ bg_options->layout()->setSpacing( 6 );
+ bg_options->layout()->setMargin( 11 );
+ TQGridLayout *bg_optionsLayout = new TQGridLayout( bg_options->layout() );
bg_optionsLayout->setAlignment( TQt::AlignTop );
cb_setcursor = new TQCheckBox(i18n("Place cursor"),bg_options);
@@ -107,7 +107,7 @@ ConfigCodeCompletion::ConfigCodeCompletion(KConfig *config, KileWidget::LogMsg *
bg_optionsLayout->addWidget(cb_autocompleteabbrev,3,2);
bg_optionsLayout->addMultiCellWidget(cb_citeoutofbraces,4,4,0,7);
- // tune tqlayout
+ // tune layout
bg_optionsLayout->setColSpacing(1,20);
bg_optionsLayout->setColSpacing(3,12);
bg_optionsLayout->setColSpacing(5,8);
@@ -126,7 +126,7 @@ ConfigCodeCompletion::ConfigCodeCompletion(KConfig *config, KileWidget::LogMsg *
// bottom: warning
TQLabel *lb_automodes = new TQLabel(i18n("Warning: all autocompletion modes will be disabled, if you enable KTextEditor plugin word completion."),this);
- // add OptionBox and TabDialog into the tqlayout
+ // add OptionBox and TabDialog into the layout
vbox->addWidget(gb_tab);
vbox->addWidget(bg_options);
vbox->addWidget(lb_automodes);
diff --git a/src/kile/configstructure.cpp b/src/kile/configstructure.cpp
index 39efcf4..d994e42 100644
--- a/src/kile/configstructure.cpp
+++ b/src/kile/configstructure.cpp
@@ -167,11 +167,11 @@ ConfigStructure::ConfigStructure(TQWidget *parent, const char *name )
hbox4->addWidget(add);
hbox4->addWidget(remove);
- // add widgets to the left vertical tqlayout
+ // add widgets to the left vertical layout
vbox1->addWidget(m_entriestable);
vbox1->addStretch();
- // add widgets to the right vertical tqlayout
+ // add widgets to the right vertical layout
vbox2->addWidget(widget3);
vbox2->addSpacing(10);
vbox2->addWidget(m_sectioningtable);
@@ -180,7 +180,7 @@ ConfigStructure::ConfigStructure(TQWidget *parent, const char *name )
vbox2->addWidget(classGroup);
vbox2->addStretch();
- // add both groupboxes to horizontal tqlayout
+ // add both groupboxes to horizontal layout
hbox->addWidget(gb_entries);
hbox->addWidget(gb_sectioning);
hbox->setStretchFactor(gb_entries,3);
diff --git a/src/kile/envconfigwidget.ui b/src/kile/envconfigwidget.ui
index b480939..588cfcd 100644
--- a/src/kile/envconfigwidget.ui
+++ b/src/kile/envconfigwidget.ui
@@ -83,7 +83,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/kile/floatdialog.cpp b/src/kile/floatdialog.cpp
index f715f46..825a707 100644
--- a/src/kile/floatdialog.cpp
+++ b/src/kile/floatdialog.cpp
@@ -39,24 +39,24 @@ FloatEnvironmentDialog::FloatEnvironmentDialog(KConfig *config, KileInfo *ki, TQ
// environment groupbox
TQButtonGroup *egroup = new TQButtonGroup( i18n("Environment"),page);
egroup->setColumnLayout(0, Qt::Vertical );
- egroup->tqlayout()->setSpacing( 6 );
- egroup->tqlayout()->setMargin( 11 );
- TQGridLayout *egrouptqlayout = new TQGridLayout( egroup->tqlayout() );
- egrouptqlayout->setAlignment( TQt::AlignTop );
+ egroup->layout()->setSpacing( 6 );
+ egroup->layout()->setMargin( 11 );
+ TQGridLayout *egrouplayout = new TQGridLayout( egroup->layout() );
+ egrouplayout->setAlignment( TQt::AlignTop );
m_rbFigure = new TQRadioButton(i18n("&Figure"), egroup);
m_rbTable = new TQRadioButton(i18n("T&able"), egroup);
- egrouptqlayout->addWidget( m_rbFigure, 0,0 );
- egrouptqlayout->addWidget( m_rbTable, 0,1 );
+ egrouplayout->addWidget( m_rbFigure, 0,0 );
+ egrouplayout->addWidget( m_rbTable, 0,1 );
// position groupbox
TQButtonGroup *pgroup = new TQButtonGroup( i18n("Position"),page);
pgroup->setColumnLayout(0, Qt::Vertical );
- pgroup->tqlayout()->setSpacing( 6 );
- pgroup->tqlayout()->setMargin( 11 );
- TQGridLayout *pgrouptqlayout = new TQGridLayout( pgroup->tqlayout() );
- pgrouptqlayout->setAlignment( TQt::AlignTop );
+ pgroup->layout()->setSpacing( 6 );
+ pgroup->layout()->setMargin( 11 );
+ TQGridLayout *pgrouplayout = new TQGridLayout( pgroup->layout() );
+ pgrouplayout->setAlignment( TQt::AlignTop );
TQLabel *label1 = new TQLabel(i18n("Here exact:"), pgroup);
TQLabel *label2 = new TQLabel(i18n("Top of page:"), pgroup);
@@ -67,14 +67,14 @@ FloatEnvironmentDialog::FloatEnvironmentDialog(KConfig *config, KileInfo *ki, TQ
m_cbBottom = new TQCheckBox(pgroup);
m_cbPage = new TQCheckBox(pgroup);
- pgrouptqlayout->addWidget( label1, 0,0 );
- pgrouptqlayout->addWidget( label2, 1,0 );
- pgrouptqlayout->addWidget( label3, 0,2 );
- pgrouptqlayout->addWidget( label4, 1,2 );
- pgrouptqlayout->addWidget( m_cbHere, 0,1 );
- pgrouptqlayout->addWidget( m_cbTop, 1,1 );
- pgrouptqlayout->addWidget( m_cbBottom, 0,3 );
- pgrouptqlayout->addWidget( m_cbPage, 1,3 );
+ pgrouplayout->addWidget( label1, 0,0 );
+ pgrouplayout->addWidget( label2, 1,0 );
+ pgrouplayout->addWidget( label3, 0,2 );
+ pgrouplayout->addWidget( label4, 1,2 );
+ pgrouplayout->addWidget( m_cbHere, 0,1 );
+ pgrouplayout->addWidget( m_cbTop, 1,1 );
+ pgrouplayout->addWidget( m_cbBottom, 0,3 );
+ pgrouplayout->addWidget( m_cbPage, 1,3 );
// center environment
TQLabel *label5 = new TQLabel(i18n("Center:"),page);
diff --git a/src/kile/generalconfigwidget.ui b/src/kile/generalconfigwidget.ui
index 946c3a8..9ffb0ea 100644
--- a/src/kile/generalconfigwidget.ui
+++ b/src/kile/generalconfigwidget.ui
@@ -99,7 +99,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/kile/includegraphicsdialog.cpp b/src/kile/includegraphicsdialog.cpp
index a6df496..3397a91 100644
--- a/src/kile/includegraphicsdialog.cpp
+++ b/src/kile/includegraphicsdialog.cpp
@@ -148,7 +148,7 @@ IncludeGraphics::IncludeGraphics(TQWidget *parent, const TQString &startdir, Kil
grid_fig->addWidget( lb_caption,2,0);
grid_fig->addWidget( edit_caption, 2,1);
- // add to tqlayout
+ // add to layout
vbox->addWidget(group);
vbox->addWidget(gb_opt);
vbox->addWidget(gb_fig);
diff --git a/src/kile/kiledocumentinfo.cpp b/src/kile/kiledocumentinfo.cpp
index 8318fe5..c06e8a1 100644
--- a/src/kile/kiledocumentinfo.cpp
+++ b/src/kile/kiledocumentinfo.cpp
@@ -484,7 +484,7 @@ const long* TextInfo::getStatistics()
return m_arStatistics;
}
-// FIXME for KDE 4.0, rearrange the hole docinfo tqlayout to get rid of this hack
+// FIXME for KDE 4.0, rearrange the hole docinfo layout to get rid of this hack
KURL TextInfo::url()
{
KURL url;
diff --git a/src/kile/kileedit.cpp b/src/kile/kileedit.cpp
index 85f4ae1..e018ec3 100644
--- a/src/kile/kileedit.cpp
+++ b/src/kile/kileedit.cpp
@@ -2662,14 +2662,14 @@ void EditorExtension::sectioningCommand(KileListViewItem *item, int id)
switch ( id )
{
case KileWidget::Structure::SectioningCut:
- TQApplication::tqclipboard()->setText( doc->text(row1,col1,row2,col2) ); // copy -> clipboard
+ TQApplication::clipboard()->setText( doc->text(row1,col1,row2,col2) ); // copy -> clipboard
doc->removeText(row1,col1,row2,col2); // delete
break;
case KileWidget::Structure::SectioningCopy:
- TQApplication::tqclipboard()->setText( doc->text(row1,col1,row2,col2) ); // copy -> clipboard
+ TQApplication::clipboard()->setText( doc->text(row1,col1,row2,col2) ); // copy -> clipboard
break;
case KileWidget::Structure::SectioningPaste:
- text = TQApplication::tqclipboard()->text(); // clipboard -> text
+ text = TQApplication::clipboard()->text(); // clipboard -> text
if ( ! text.isEmpty() )
{
view->setCursorPositionReal(row2,col2); // insert
diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp
index 16fdd8e..9a460d6 100644
--- a/src/kile/kilegrepdialog.cpp
+++ b/src/kile/kilegrepdialog.cpp
@@ -88,10 +88,10 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
// project groupbox
TQGroupBox *projectgroup = new TQGroupBox( i18n("Project"),page);
projectgroup->setColumnLayout(0, Qt::Vertical );
- projectgroup->tqlayout()->setSpacing( 6 );
- projectgroup->tqlayout()->setMargin( 11 );
- TQGridLayout *projectgrouptqlayout = new TQGridLayout( projectgroup->tqlayout() );
- projectgrouptqlayout->setAlignment( TQt::AlignTop );
+ projectgroup->layout()->setSpacing( 6 );
+ projectgroup->layout()->setMargin( 11 );
+ TQGridLayout *projectgrouplayout = new TQGridLayout( projectgroup->layout() );
+ projectgrouplayout->setAlignment( TQt::AlignTop );
TQLabel *project_label = new TQLabel(i18n("Name:"), projectgroup);
int labelwidth = project_label->sizeHint().width();
@@ -103,19 +103,19 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
projectname_label = new TQLabel(projectgroup);
projectdirname_label = new TQLabel(projectgroup);
- projectgrouptqlayout->addWidget(project_label, 0,0, AlignLeft | AlignVCenter);
- projectgrouptqlayout->addWidget(projectname_label, 0,1, AlignLeft | AlignVCenter);
- projectgrouptqlayout->addWidget(projectdir_label, 1,0, AlignLeft | AlignVCenter);
- projectgrouptqlayout->addWidget(projectdirname_label, 1,1, AlignLeft | AlignVCenter);
- projectgrouptqlayout->setColStretch(1,1);
+ projectgrouplayout->addWidget(project_label, 0,0, AlignLeft | AlignVCenter);
+ projectgrouplayout->addWidget(projectname_label, 0,1, AlignLeft | AlignVCenter);
+ projectgrouplayout->addWidget(projectdir_label, 1,0, AlignLeft | AlignVCenter);
+ projectgrouplayout->addWidget(projectdirname_label, 1,1, AlignLeft | AlignVCenter);
+ projectgrouplayout->setColStretch(1,1);
// search groupbox
TQGroupBox *searchgroup = new TQGroupBox( i18n("Search"),page);
searchgroup->setColumnLayout(0, Qt::Vertical );
- searchgroup->tqlayout()->setSpacing( 6 );
- searchgroup->tqlayout()->setMargin( 11 );
- TQGridLayout *searchgrouptqlayout = new TQGridLayout( searchgroup->tqlayout() );
- searchgrouptqlayout->setAlignment( TQt::AlignTop );
+ searchgroup->layout()->setSpacing( 6 );
+ searchgroup->layout()->setMargin( 11 );
+ TQGridLayout *searchgrouplayout = new TQGridLayout( searchgroup->layout() );
+ searchgrouplayout->setAlignment( TQt::AlignTop );
TQLabel *pattern_label = new TQLabel(i18n("Pattern:"), searchgroup);
if ( pattern_label->sizeHint().width() > labelwidth )
@@ -156,18 +156,18 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
template_label->setBuddy(template_edit);
template_layout->addWidget(template_edit);
- searchgrouptqlayout->addWidget(pattern_label, 0,0, AlignLeft | AlignVCenter);
- searchgrouptqlayout->addWidget(pattern_combo, 0,1);
- searchgrouptqlayout->addWidget(template_label, 1,0, AlignLeft | AlignVCenter);
- searchgrouptqlayout->addLayout(template_layout, 1,1);
+ searchgrouplayout->addWidget(pattern_label, 0,0, AlignLeft | AlignVCenter);
+ searchgrouplayout->addWidget(pattern_combo, 0,1);
+ searchgrouplayout->addWidget(template_label, 1,0, AlignLeft | AlignVCenter);
+ searchgrouplayout->addLayout(template_layout, 1,1);
// filter groupbox
TQGroupBox *filtergroup = new TQGroupBox( i18n("Directory Options"),page);
filtergroup->setColumnLayout(0, Qt::Vertical );
- filtergroup->tqlayout()->setSpacing( 6 );
- filtergroup->tqlayout()->setMargin( 11 );
- TQGridLayout *filtergrouptqlayout = new TQGridLayout( filtergroup->tqlayout() );
- filtergrouptqlayout->setAlignment( TQt::AlignTop );
+ filtergroup->layout()->setSpacing( 6 );
+ filtergroup->layout()->setMargin( 11 );
+ TQGridLayout *filtergrouplayout = new TQGridLayout( filtergroup->layout() );
+ filtergrouplayout->setAlignment( TQt::AlignTop );
TQLabel *files_label = new TQLabel(i18n("Filter:"), filtergroup);
if ( files_label->sizeHint().width() > labelwidth )
@@ -191,12 +191,12 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
recursive_box = new TQCheckBox(i18n("Scan directories recursively"), filtergroup);
recursive_box->setMinimumWidth(recursive_box->sizeHint().width());
- filtergrouptqlayout->addWidget(files_label, 2,0, AlignLeft | AlignVCenter);
- filtergrouptqlayout->addWidget(filter_combo, 2, 1);
- filtergrouptqlayout->addWidget(dir_label, 3,0, AlignLeft | AlignVCenter);
- filtergrouptqlayout->addLayout(dir_layout, 3,1);
- filtergrouptqlayout->addMultiCellWidget(recursive_box, 4,4, 1,2);
- filtergrouptqlayout->setColStretch(1,1);
+ filtergrouplayout->addWidget(files_label, 2,0, AlignLeft | AlignVCenter);
+ filtergrouplayout->addWidget(filter_combo, 2, 1);
+ filtergrouplayout->addWidget(dir_label, 3,0, AlignLeft | AlignVCenter);
+ filtergrouplayout->addLayout(dir_layout, 3,1);
+ filtergrouplayout->addMultiCellWidget(recursive_box, 4,4, 1,2);
+ filtergrouplayout->setColStretch(1,1);
// result box
resultbox = new KListBox(page);
@@ -215,7 +215,7 @@ KileGrepDialog::KileGrepDialog(TQWidget *parent, KileInfo *ki, KileGrep::Mode mo
#else
close_button = actionbox->addButton(i18n("Cl&ose"));
#endif
- actionbox->tqlayout();
+ actionbox->layout();
// adjust labels
project_label->setFixedWidth(labelwidth);
diff --git a/src/kile/kilehelp.cpp b/src/kile/kilehelp.cpp
index b659c49..7be9e10 100644
--- a/src/kile/kilehelp.cpp
+++ b/src/kile/kilehelp.cpp
@@ -39,7 +39,7 @@
// tbraun 27.06.2007
-// it _looks_ like texlive 2007 has the same tqlayout than texlive 2005 so don't get confused about the variable names :)
+// it _looks_ like texlive 2007 has the same layout than texlive 2005 so don't get confused about the variable names :)
namespace KileHelp
{
diff --git a/src/kile/kilejscript.cpp b/src/kile/kilejscript.cpp
index 76b0e98..dc77ef9 100644
--- a/src/kile/kilejscript.cpp
+++ b/src/kile/kilejscript.cpp
@@ -93,7 +93,7 @@ namespace KJS {
UString::UString(const TQString &d) {
unsigned int len = d.length();
UChar *dat = new UChar[len];
- memcpy(dat, d.tqunicode(), len * sizeof(UChar));
+ memcpy(dat, d.unicode(), len * sizeof(UChar));
rep = UString::Rep::create(dat, len);
}
diff --git a/src/kile/kilelistselector.cpp b/src/kile/kilelistselector.cpp
index 59532e5..bd62f98 100644
--- a/src/kile/kilelistselector.cpp
+++ b/src/kile/kilelistselector.cpp
@@ -31,10 +31,10 @@
KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQString &caption, const TQString &select, TQWidget *parent, const char *name) :
KDialogBase( KDialogBase::Plain, caption, Ok|Cancel,Ok, parent, name, true, true )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(plainPage());
+ TQVBoxLayout *layout = new TQVBoxLayout(plainPage());
- tqlayout->addWidget(new TQLabel(select, plainPage()));
- tqlayout->addSpacing(8);
+ layout->addWidget(new TQLabel(select, plainPage()));
+ layout->addSpacing(8);
m_listview = new KListView(plainPage());
m_listview->addColumn(i18n("Files"));
@@ -50,7 +50,7 @@ KileListSelectorBase::KileListSelectorBase(const TQStringList &list, const TQStr
#if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
m_listview->setShadeSortColumn(false);
#endif
- tqlayout->addWidget(m_listview);
+ layout->addWidget(m_listview);
insertStringList(list);
diff --git a/src/kile/kilemultitabbar.cpp b/src/kile/kilemultitabbar.cpp
index 1e21d34..a073d4e 100644
--- a/src/kile/kilemultitabbar.cpp
+++ b/src/kile/kilemultitabbar.cpp
@@ -491,7 +491,7 @@ TQSize KileMultiTabBarButton::sizeHint() const
}
#endif
if ( isMenuButton() )
- w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+ w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
if ( pixmap() ) {
TQPixmap *pm = (TQPixmap *)pixmap();
@@ -510,7 +510,7 @@ TQSize KileMultiTabBarButton::sizeHint() const
h = TQMAX(h, sz.height());
}
- return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+ return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
expandedTo(TQApplication::globalStrut()));
}
diff --git a/src/kile/kileprojectdlgs.cpp b/src/kile/kileprojectdlgs.cpp
index 8ac9b59..49178d3 100644
--- a/src/kile/kileprojectdlgs.cpp
+++ b/src/kile/kileprojectdlgs.cpp
@@ -62,9 +62,9 @@ KileProjectDlgBase::KileProjectDlgBase(const TQString &caption, KileDocument::Ex
// properties groupbox
m_pgroup = new TQVGroupBox(i18n("Project"), plainPage());
m_pgroup->setColumnLayout(0, Qt::Vertical );
- m_pgroup->tqlayout()->setSpacing( 6 );
- m_pgroup->tqlayout()->setMargin( 11 );
- m_pgrid = new TQGridLayout( m_pgroup->tqlayout() );
+ m_pgroup->layout()->setSpacing( 6 );
+ m_pgroup->layout()->setMargin( 11 );
+ m_pgrid = new TQGridLayout( m_pgroup->layout() );
m_pgrid->setAlignment( TQt::AlignTop );
m_title = new KLineEdit(m_pgroup, "le_projectname");
@@ -76,9 +76,9 @@ KileProjectDlgBase::KileProjectDlgBase(const TQString &caption, KileDocument::Ex
// extensions groupbox
m_egroup= new TQVGroupBox(i18n("Extensions"), plainPage());
m_egroup->setColumnLayout(0, Qt::Vertical );
- m_egroup->tqlayout()->setSpacing( 6 );
- m_egroup->tqlayout()->setMargin( 11 );
- m_egrid = new TQGridLayout( m_egroup->tqlayout() );
+ m_egroup->layout()->setSpacing( 6 );
+ m_egroup->layout()->setMargin( 11 );
+ m_egrid = new TQGridLayout( m_egroup->layout() );
m_egrid->setAlignment( TQt::AlignTop );
m_extensions = new KLineEdit(m_egroup, "le_ext");
@@ -262,7 +262,7 @@ KileNewProjectDlg::KileNewProjectDlg(KileTemplate::Manager *templateManager, Kil
m_egrid->addWidget(m_lbPredefinedExtensions, 7,0);
m_egrid->addMultiCellWidget(m_lbStandardExtensions, 7,7, 1,3);
- // add to tqlayout
+ // add to layout
vbox->addWidget(m_pgroup);
vbox->addWidget(group2);
vbox->addWidget(m_egroup);
@@ -492,9 +492,9 @@ KileProjectOptionsDlg::KileProjectOptionsDlg(KileProject *project, KileDocument:
// third groupbox
TQVGroupBox* group3 = new TQVGroupBox(i18n("Properties"), plainPage());
group3->setColumnLayout(0, Qt::Vertical );
- group3->tqlayout()->setSpacing( 6 );
- group3->tqlayout()->setMargin( 11 );
- TQGridLayout *grid3 = new TQGridLayout( group3->tqlayout() );
+ group3->layout()->setSpacing( 6 );
+ group3->layout()->setMargin( 11 );
+ TQGridLayout *grid3 = new TQGridLayout( group3->layout() );
grid3->setAlignment( TQt::AlignTop );
m_master = new KComboBox(false, group3, "master");
@@ -547,7 +547,7 @@ KileProjectOptionsDlg::KileProjectOptionsDlg(KileProject *project, KileDocument:
grid3->addMultiCellWidget(m_leMakeIndex,2,2,1,2);
grid3->setColStretch(2,1);
- // add to tqlayout
+ // add to layout
vbox->addWidget(m_pgroup);
vbox->addWidget(m_egroup);
vbox->addWidget(group3);
diff --git a/src/kile/kilesidebar.cpp b/src/kile/kilesidebar.cpp
index 151f577..eaffe34 100644
--- a/src/kile/kilesidebar.cpp
+++ b/src/kile/kilesidebar.cpp
@@ -38,7 +38,7 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, Qt::Orien
setLineWidth(0);
setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
- TQLayout *tqlayout;
+ TQLayout *layout;
m_tabStack = new TQWidgetStack(this);
m_tabStack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
@@ -47,13 +47,13 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, Qt::Orien
KileMultiTabBar::KileMultiTabBarPosition tabbarpos = KileMultiTabBar::Top;
if ( orientation == Qt::Horizontal )
{
- tqlayout = new TQVBoxLayout(this);
+ layout = new TQVBoxLayout(this);
tabbarori = KileMultiTabBar::Horizontal;
tabbarpos = KileMultiTabBar::Top;
}
else if ( orientation == Qt::Vertical )
{
- tqlayout = new TQHBoxLayout(this);
+ layout = new TQHBoxLayout(this);
tabbarori = KileMultiTabBar::Vertical;
tabbarpos = KileMultiTabBar::Right;
}
@@ -72,16 +72,16 @@ KileSideBar::KileSideBar(int size, TQWidget *parent, const char *name, Qt::Orien
setMinimumHeight(m_tabBar->height());
m_nMinSize = m_tabBar->height();
m_nMaxSize = m_tabBar->maximumHeight();
- tqlayout->add(m_tabBar);
- tqlayout->add(m_tabStack);
+ layout->add(m_tabBar);
+ layout->add(m_tabStack);
}
else if ( orientation == Qt::Vertical )
{
setMinimumWidth(m_tabBar->width());
m_nMinSize = m_tabBar->width();
m_nMaxSize = m_tabBar->maximumWidth();
- tqlayout->add(m_tabStack);
- tqlayout->add(m_tabBar);
+ layout->add(m_tabStack);
+ layout->add(m_tabBar);
}
}
diff --git a/src/kile/kilestatsdlg.cpp b/src/kile/kilestatsdlg.cpp
index f5591ae..33c9709 100644
--- a/src/kile/kilestatsdlg.cpp
+++ b/src/kile/kilestatsdlg.cpp
@@ -141,7 +141,7 @@ void KileStatsDlg::slotUser1() // Copy
KILE_DEBUG() << "Copy Button was clicked" << endl;
KILE_DEBUG() << "Open tab is " << activePageIndex() << ' ' + ( m_pagetoname.contains(activePageIndex()) ? m_pagetoname[activePageIndex()] : "No such entry" )<< endl;
- TQClipboard *clip = KApplication::tqclipboard();
+ TQClipboard *clip = KApplication::clipboard();
TQString text;
convertText(&text,false);
clip->setText(text,TQClipboard::Selection); // the text will be available with the middle mouse button
@@ -152,7 +152,7 @@ void KileStatsDlg::slotUser2() // CopyAsLaTeX
KILE_DEBUG() << "CopyAsLateX Button was clicked" << endl;
KILE_DEBUG() << "Open tab is " << activePageIndex() << ' ' + ( m_pagetoname.contains(activePageIndex()) ? m_pagetoname[activePageIndex()] : "No such entry" )<< endl;
- TQClipboard *clip = KApplication::tqclipboard();
+ TQClipboard *clip = KApplication::clipboard();
TQString text;
convertText(&text,true);
clip->setText(text,TQClipboard::Selection);
diff --git a/src/kile/kilestatswidget.cpp b/src/kile/kilestatswidget.cpp
index 601f508..b6b37fa 100644
--- a/src/kile/kilestatswidget.cpp
+++ b/src/kile/kilestatswidget.cpp
@@ -34,10 +34,10 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
// characters groupbox
TQGroupBox *chargroup = new TQGroupBox( i18n("Characters"),parent);
chargroup->setColumnLayout(0, Qt::Vertical );
- chargroup->tqlayout()->setSpacing( 6 );
- chargroup->tqlayout()->setMargin( 11 );
- chargrouptqlayout = new TQGridLayout( chargroup->tqlayout() );
- chargrouptqlayout->setAlignment( TQt::AlignTop );
+ chargroup->layout()->setSpacing( 6 );
+ chargroup->layout()->setMargin( 11 );
+ chargrouplayout = new TQGridLayout( chargroup->layout() );
+ chargrouplayout->setAlignment( TQt::AlignTop );
m_wordCharText = new TQLabel(i18n("Words and numbers:"), chargroup);
m_commandCharText = new TQLabel(i18n("LaTeX commands and environments:"), chargroup);
@@ -52,26 +52,26 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
charframe->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
charframe->setLineWidth(1);
- chargrouptqlayout->addWidget( m_wordCharText, 0,0 );
- chargrouptqlayout->addWidget( m_commandCharText, 1,0 );
- chargrouptqlayout->addWidget( m_whitespaceCharText, 2,0 );
- chargrouptqlayout->addWidget( m_totalCharText, 4,0 );
- chargrouptqlayout->addWidget( m_wordChar, 0,2,TQt::AlignRight );
- chargrouptqlayout->addWidget( m_commandChar, 1,2,TQt::AlignRight );
- chargrouptqlayout->addWidget( m_whitespaceChar, 2,2,TQt::AlignRight );
- chargrouptqlayout->addMultiCellWidget( charframe, 3,3,1,2 );
- chargrouptqlayout->addWidget( m_totalChar, 4,2,TQt::AlignRight );
- chargrouptqlayout->setColSpacing(1,16);
- chargrouptqlayout->setColSpacing(3,1);
- chargrouptqlayout->setColStretch(3,1);
+ chargrouplayout->addWidget( m_wordCharText, 0,0 );
+ chargrouplayout->addWidget( m_commandCharText, 1,0 );
+ chargrouplayout->addWidget( m_whitespaceCharText, 2,0 );
+ chargrouplayout->addWidget( m_totalCharText, 4,0 );
+ chargrouplayout->addWidget( m_wordChar, 0,2,TQt::AlignRight );
+ chargrouplayout->addWidget( m_commandChar, 1,2,TQt::AlignRight );
+ chargrouplayout->addWidget( m_whitespaceChar, 2,2,TQt::AlignRight );
+ chargrouplayout->addMultiCellWidget( charframe, 3,3,1,2 );
+ chargrouplayout->addWidget( m_totalChar, 4,2,TQt::AlignRight );
+ chargrouplayout->setColSpacing(1,16);
+ chargrouplayout->setColSpacing(3,1);
+ chargrouplayout->setColStretch(3,1);
// string groupbox
TQGroupBox *stringgroup = new TQGroupBox( i18n("Strings"),parent);
stringgroup->setColumnLayout(0, Qt::Vertical );
- stringgroup->tqlayout()->setSpacing( 6 );
- stringgroup->tqlayout()->setMargin( 11 );
- stringgrouptqlayout = new TQGridLayout( stringgroup->tqlayout() );
- stringgrouptqlayout->setAlignment( TQt::AlignTop );
+ stringgroup->layout()->setSpacing( 6 );
+ stringgroup->layout()->setMargin( 11 );
+ stringgrouplayout = new TQGridLayout( stringgroup->layout() );
+ stringgrouplayout->setAlignment( TQt::AlignTop );
m_wordStringText = new TQLabel(i18n("Words:"), stringgroup);
m_commandStringText = new TQLabel(i18n("LaTeX commands:"), stringgroup);
@@ -86,18 +86,18 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
stringframe->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
stringframe->setLineWidth(1);
- stringgrouptqlayout->addWidget( m_wordStringText, 0,0 );
- stringgrouptqlayout->addWidget( m_commandStringText, 1,0 );
- stringgrouptqlayout->addWidget( m_environmentStringText, 2,0 );
- stringgrouptqlayout->addWidget( m_totalStringText, 4,0 );
- stringgrouptqlayout->addWidget( m_wordString, 0,2,TQt::AlignRight );
- stringgrouptqlayout->addWidget( m_commandString, 1,2,TQt::AlignRight );
- stringgrouptqlayout->addWidget( m_environmentString, 2,2,TQt::AlignRight );
- stringgrouptqlayout->addMultiCellWidget( stringframe, 3,3,1,2 );
- stringgrouptqlayout->addWidget( m_totalString, 4,2,TQt::AlignRight );
- stringgrouptqlayout->setColSpacing(1,16);
- stringgrouptqlayout->setColSpacing(3,1);
- stringgrouptqlayout->setColStretch(3,1);
+ stringgrouplayout->addWidget( m_wordStringText, 0,0 );
+ stringgrouplayout->addWidget( m_commandStringText, 1,0 );
+ stringgrouplayout->addWidget( m_environmentStringText, 2,0 );
+ stringgrouplayout->addWidget( m_totalStringText, 4,0 );
+ stringgrouplayout->addWidget( m_wordString, 0,2,TQt::AlignRight );
+ stringgrouplayout->addWidget( m_commandString, 1,2,TQt::AlignRight );
+ stringgrouplayout->addWidget( m_environmentString, 2,2,TQt::AlignRight );
+ stringgrouplayout->addMultiCellWidget( stringframe, 3,3,1,2 );
+ stringgrouplayout->addWidget( m_totalString, 4,2,TQt::AlignRight );
+ stringgrouplayout->setColSpacing(1,16);
+ stringgrouplayout->setColSpacing(3,1);
+ stringgrouplayout->setColStretch(3,1);
m_commentAboutHelp = new TQLabel(parent);
m_warning = new TQLabel(parent);
@@ -112,7 +112,7 @@ KileWidgetStatistics::KileWidgetStatistics( TQWidget* parent, const char* name,
int w = m_commandCharText->sizeHint().width();
if ( m_whitespaceCharText->sizeHint().width() > w )
w = m_whitespaceCharText->sizeHint().width();
- stringgrouptqlayout->setColSpacing(0,w);
+ stringgrouplayout->setColSpacing(0,w);
}
@@ -125,8 +125,8 @@ void KileWidgetStatistics::updateColumns()
int w = m_totalChar->sizeHint().width();
if ( m_totalString->sizeHint().width() > w )
w = m_totalString->sizeHint().width();
- chargrouptqlayout->setColSpacing(2,w);
- stringgrouptqlayout->setColSpacing(2,w);
+ chargrouplayout->setColSpacing(2,w);
+ stringgrouplayout->setColSpacing(2,w);
}
diff --git a/src/kile/kilestatswidget.h b/src/kile/kilestatswidget.h
index 93168c6..3057092 100644
--- a/src/kile/kilestatswidget.h
+++ b/src/kile/kilestatswidget.h
@@ -58,8 +58,8 @@ public:
void updateColumns();
private:
- TQGridLayout *chargrouptqlayout;
- TQGridLayout *stringgrouptqlayout;
+ TQGridLayout *chargrouplayout;
+ TQGridLayout *stringgrouplayout;
};
diff --git a/src/kile/kilestdactions.cpp b/src/kile/kilestdactions.cpp
index d13ec32..6d3c99c 100644
--- a/src/kile/kilestdactions.cpp
+++ b/src/kile/kilestdactions.cpp
@@ -35,7 +35,7 @@ void setupStdTags(KileInfo *ki, KMainWindow *parent)
(void) new KileAction::Tag(i18n("Document Class Selection - \\documentclass{}"),0,TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(), "tag_documentclass",
"\\documentclass[10pt]{","}", 21,0,i18n("\\documentclass[options]{class}\nclass : article,report,book,letter\nsize options : 10pt, 11pt, 12pt\npaper size options: a4paper, a5paper, b5paper, letterpaper, legalpaper, executivepaper\n"
"other options: \nlandscape -- selects landscape format; default is portrait. \ntitlepage, notitlepage -- selects if there should be a separate title page.\nleqno -- display equation number on left side of equations; default is right side.\n"
- "fleqn -- display formulae flush left; default is centered.\nonecolumn, twocolumn -- one or two columns; defaults to one column\noneside, twoside -- selects one- or two-sided tqlayout.\n" ));
+ "fleqn -- display formulae flush left; default is centered.\nonecolumn, twocolumn -- one or two columns; defaults to one column\noneside, twoside -- selects one- or two-sided layout.\n" ));
(void) new KileAction::Tag(i18n("Package Import - \\usepackage{}"),0, TQT_TQOBJECT(parent), TQT_SLOT(insertTag(const KileAction::TagData&)), parent->actionCollection(),"tag_usepackage",
"\\usepackage{","}",12,0,i18n("Any options given in the \\documentclass command that are unknown by the selected document class\n"
diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp
index 819d7c5..4f923b4 100644
--- a/src/kile/kilestructurewidget.cpp
+++ b/src/kile/kilestructurewidget.cpp
@@ -825,7 +825,7 @@ namespace KileWidget
if ( id <= 3 )
emit( sendText(s) );
else
- TQApplication::tqclipboard()->setText(s);
+ TQApplication::clipboard()->setText(s);
}
// id's 10..16 (already checked)
diff --git a/src/kile/kiletoolconfigwidget.cpp b/src/kile/kiletoolconfigwidget.cpp
index 7cdb68d..1611186 100644
--- a/src/kile/kiletoolconfigwidget.cpp
+++ b/src/kile/kiletoolconfigwidget.cpp
@@ -236,7 +236,7 @@ namespace KileWidget
if (szHint.height() > 0)
m_configWidget->m_stackExtra->setMaximumHeight(szHint.height());
}
- m_configWidget->tqlayout()->invalidate();
+ m_configWidget->layout()->invalidate();
}
void ToolConfig::writeDefaults()
diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp
index 5eca8a4..9899b74 100644
--- a/src/kile/kileviewmanager.cpp
+++ b/src/kile/kileviewmanager.cpp
@@ -361,7 +361,7 @@ void Manager::onKatePopupMenuRequest(void)
if(!pasteAsLaTeXAction->isPlugged())
pasteAsLaTeXAction->plug(viewPopupMenu);
- TQClipboard *clip = KApplication::tqclipboard();
+ TQClipboard *clip = KApplication::clipboard();
if(NULL != clip)
pasteAsLaTeXAction->setEnabled(!clip->text().isNull());
}
@@ -464,7 +464,7 @@ void Manager::pasteAsLaTeX(void)
doc->removeSelectedText();
PlainToLaTeXConverter cvt;
- TQString toPaste = cvt.ConvertToLaTeX(KApplication::tqclipboard()->text());
+ TQString toPaste = cvt.ConvertToLaTeX(KApplication::clipboard()->text());
doc->insertText(cursorLine, cursorCol, toPaste);
// End of the "atomic edit operation"
diff --git a/src/kile/latexcmddialog.cpp b/src/kile/latexcmddialog.cpp
index 324a932..fb3ca0a 100644
--- a/src/kile/latexcmddialog.cpp
+++ b/src/kile/latexcmddialog.cpp
@@ -66,7 +66,7 @@ NewLatexCommand::NewLatexCommand(TQWidget *parent, const TQString &caption,
TQWidget *page = new TQWidget( this );
setMainWidget(page);
- // tqlayout
+ // layout
TQVBoxLayout *vbox = new TQVBoxLayout(page, 6,6 );
TQLabel *label1 = new TQLabel(page);
diff --git a/src/kile/mathenvdialog.cpp b/src/kile/mathenvdialog.cpp
index 4b21f3a..6f00b55 100644
--- a/src/kile/mathenvdialog.cpp
+++ b/src/kile/mathenvdialog.cpp
@@ -43,8 +43,8 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
// environment groupbox
TQButtonGroup *envgroup = new TQButtonGroup( i18n("Environment"),page);
envgroup->setColumnLayout(0, Qt::Vertical );
- envgroup->tqlayout()->setSpacing( 6 );
- envgroup->tqlayout()->setMargin( 11 );
+ envgroup->layout()->setSpacing( 6 );
+ envgroup->layout()->setMargin( 11 );
m_lbEnvironment = new TQLabel(i18n("&Name:"),envgroup);
m_lbStarred = new TQLabel(i18n("Without n&umbering:"),envgroup);
@@ -70,28 +70,28 @@ MathEnvironmentDialog::MathEnvironmentDialog(TQWidget *parent, KConfig *config,
m_coDisplaymath = new TQComboBox(envgroup);
m_cbBullets = new TQCheckBox(envgroup);
- TQGridLayout *envtqlayout = new TQGridLayout( envgroup->tqlayout() );
- envtqlayout->setAlignment( TQt::AlignTop );
- envtqlayout->addWidget( m_lbEnvironment, 0,0 );
- envtqlayout->addWidget( m_lbStarred, 1,0 );
- envtqlayout->addWidget( m_lbRows, 2,0 );
- envtqlayout->addWidget( m_lbCols, 3,0 );
- envtqlayout->addWidget( m_lbTabulator, 5,0 );
- envtqlayout->addWidget( m_lbDisplaymath, 6,0 );
- envtqlayout->addWidget( m_coEnvironment, 0,1 );
- envtqlayout->addWidget( m_cbStarred, 1,1 );
- envtqlayout->addWidget( m_spRows, 2,1 );
- envtqlayout->addWidget( m_spCols, 3,1 );
- envtqlayout->addWidget( m_coTabulator, 5,1 );
- envtqlayout->addWidget( m_coDisplaymath, 6,1 );
- envtqlayout->addWidget( m_lbSpace, 3,3 );
- envtqlayout->addWidget( m_lbBullets, 5,3 );
- envtqlayout->addWidget( m_edSpace, 3,4 );
- envtqlayout->addWidget( m_cbBullets, 5,4 );
- envtqlayout->addMultiCellWidget(frame,4,4,0,4);
- envtqlayout->setRowSpacing(4,30);
- envtqlayout->setColSpacing(2,20);
- envtqlayout->setColStretch(4,1);
+ TQGridLayout *envlayout = new TQGridLayout( envgroup->layout() );
+ envlayout->setAlignment( TQt::AlignTop );
+ envlayout->addWidget( m_lbEnvironment, 0,0 );
+ envlayout->addWidget( m_lbStarred, 1,0 );
+ envlayout->addWidget( m_lbRows, 2,0 );
+ envlayout->addWidget( m_lbCols, 3,0 );
+ envlayout->addWidget( m_lbTabulator, 5,0 );
+ envlayout->addWidget( m_lbDisplaymath, 6,0 );
+ envlayout->addWidget( m_coEnvironment, 0,1 );
+ envlayout->addWidget( m_cbStarred, 1,1 );
+ envlayout->addWidget( m_spRows, 2,1 );
+ envlayout->addWidget( m_spCols, 3,1 );
+ envlayout->addWidget( m_coTabulator, 5,1 );
+ envlayout->addWidget( m_coDisplaymath, 6,1 );
+ envlayout->addWidget( m_lbSpace, 3,3 );
+ envlayout->addWidget( m_lbBullets, 5,3 );
+ envlayout->addWidget( m_edSpace, 3,4 );
+ envlayout->addWidget( m_cbBullets, 5,4 );
+ envlayout->addMultiCellWidget(frame,4,4,0,4);
+ envlayout->setRowSpacing(4,30);
+ envlayout->setColSpacing(2,20);
+ envlayout->setColStretch(4,1);
// add widgets
vbox->addWidget( envgroup);
diff --git a/src/kile/newdocumentwidget.ui b/src/kile/newdocumentwidget.ui
index 005f83f..5f91b38 100644
--- a/src/kile/newdocumentwidget.ui
+++ b/src/kile/newdocumentwidget.ui
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/kile/previewconfigwidget.cpp b/src/kile/previewconfigwidget.cpp
index c7b7d91..eb6d91b 100644
--- a/src/kile/previewconfigwidget.cpp
+++ b/src/kile/previewconfigwidget.cpp
@@ -39,9 +39,9 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
TQGroupBox *groupbox = new TQGroupBox( i18n("Quick Preview in a separate window"), this, "groupbox" );
groupbox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) );
groupbox->setColumnLayout(0, Qt::Vertical );
- groupbox->tqlayout()->setSpacing( 6 );
- groupbox->tqlayout()->setMargin( 11 );
- TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->tqlayout() );
+ groupbox->layout()->setSpacing( 6 );
+ groupbox->layout()->setMargin( 11 );
+ TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->layout() );
groupboxLayout->setAlignment( TQt::AlignTop );
TQLabel *label = new TQLabel( i18n("Select a configuration:"), groupbox, "label");
@@ -54,9 +54,9 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
TQGroupBox *gbResolution = new TQGroupBox( i18n("Quick Preview in bottom bar"), this, "gbresolution" );
gbResolution->setColumnLayout(0, Qt::Vertical );
- gbResolution->tqlayout()->setSpacing( 6 );
- gbResolution->tqlayout()->setMargin( 11 );
- TQGridLayout *resLayout = new TQGridLayout( gbResolution->tqlayout() );
+ gbResolution->layout()->setSpacing( 6 );
+ gbResolution->layout()->setMargin( 11 );
+ TQGridLayout *resLayout = new TQGridLayout( gbResolution->layout() );
resLayout->setAlignment( TQt::AlignTop );
TQLabel *resLabel = new TQLabel( i18n("&Resolution:"), gbResolution );
@@ -97,9 +97,9 @@ KileWidgetPreviewConfig::KileWidgetPreviewConfig(KConfig *config, KileTool::Quic
m_gbPreview = new TQGroupBox( i18n("Properties"), this, "gbpreview" );
m_gbPreview->setColumnLayout(0, Qt::Vertical );
- m_gbPreview->tqlayout()->setSpacing( 6 );
- m_gbPreview->tqlayout()->setMargin( 11 );
- TQGridLayout *previewLayout = new TQGridLayout( m_gbPreview->tqlayout() );
+ m_gbPreview->layout()->setSpacing( 6 );
+ m_gbPreview->layout()->setMargin( 11 );
+ TQGridLayout *previewLayout = new TQGridLayout( m_gbPreview->layout() );
previewLayout->setAlignment( TQt::AlignTop );
TQLabel *labelPreviewWidget = new TQLabel(i18n("Show preview in bottom bar:"), m_gbPreview);
diff --git a/src/kile/quickdocumentdialog.cpp b/src/kile/quickdocumentdialog.cpp
index 7537690..14f6330 100644
--- a/src/kile/quickdocumentdialog.cpp
+++ b/src/kile/quickdocumentdialog.cpp
@@ -2203,7 +2203,7 @@ QuickDocumentInputDialog::QuickDocumentInputDialog(const TQStringList &list,int
((TQLabel *)m_objectlist[i-1])->setBuddy(m_objectlist[i]);
}
- // insert the new object into the tqlayout
+ // insert the new object into the layout
vl->addWidget(m_objectlist[i]);
}
diff --git a/src/kile/scriptingconfigwidget.ui b/src/kile/scriptingconfigwidget.ui
index 699a035..5a1ea43 100644
--- a/src/kile/scriptingconfigwidget.ui
+++ b/src/kile/scriptingconfigwidget.ui
@@ -90,7 +90,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/kile/symbolviewconfig.ui b/src/kile/symbolviewconfig.ui
index ffb9788..afb1df7 100644
--- a/src/kile/symbolviewconfig.ui
+++ b/src/kile/symbolviewconfig.ui
@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -40,7 +40,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/src/kile/tabulardialog.cpp b/src/kile/tabulardialog.cpp
index 364de37..8187b76 100644
--- a/src/kile/tabulardialog.cpp
+++ b/src/kile/tabulardialog.cpp
@@ -261,56 +261,56 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
// font group
TQGroupBox *fontgroup = new TQGroupBox( i18n("Font"),page);
fontgroup->setColumnLayout(0, Qt::Vertical );
- fontgroup->tqlayout()->setSpacing( 6 );
- fontgroup->tqlayout()->setMargin( 11 );
+ fontgroup->layout()->setSpacing( 6 );
+ fontgroup->layout()->setMargin( 11 );
m_cbBold = new TQCheckBox(i18n("Bold"),fontgroup);
m_cbItalic = new TQCheckBox(i18n("Italic"),fontgroup);
- TQVBoxLayout *fontgrouptqlayout = new TQVBoxLayout( fontgroup->tqlayout() );
- fontgrouptqlayout->setAlignment( TQt::AlignTop );
- fontgrouptqlayout->addWidget( m_cbBold );
- fontgrouptqlayout->addWidget( m_cbItalic );
+ TQVBoxLayout *fontgrouplayout = new TQVBoxLayout( fontgroup->layout() );
+ fontgrouplayout->setAlignment( TQt::AlignTop );
+ fontgrouplayout->addWidget( m_cbBold );
+ fontgrouplayout->addWidget( m_cbItalic );
// color group
TQGroupBox *colorgroup = new TQGroupBox( i18n("Color"),page);
colorgroup->setColumnLayout(0, Qt::Vertical );
- colorgroup->tqlayout()->setSpacing( 6 );
- colorgroup->tqlayout()->setMargin( 11 );
+ colorgroup->layout()->setSpacing( 6 );
+ colorgroup->layout()->setMargin( 11 );
TQLabel *label1 = new TQLabel(i18n("Background:"),colorgroup);
TQLabel *label2 = new TQLabel(i18n("Textcolor:"),colorgroup);
m_ccBgcolor = new KColorCombo(colorgroup);
m_ccTextcolor = new KColorCombo(colorgroup);
- TQGridLayout *colorgrouptqlayout = new TQGridLayout( colorgroup->tqlayout() );
- colorgrouptqlayout->setAlignment( TQt::AlignTop );
- colorgrouptqlayout->addWidget( label1,0,0 );
- colorgrouptqlayout->addWidget( label2,1,0 );
- colorgrouptqlayout->addWidget( m_ccBgcolor,0,1 );
- colorgrouptqlayout->addWidget( m_ccTextcolor,1,1 );
+ TQGridLayout *colorgrouplayout = new TQGridLayout( colorgroup->layout() );
+ colorgrouplayout->setAlignment( TQt::AlignTop );
+ colorgrouplayout->addWidget( label1,0,0 );
+ colorgrouplayout->addWidget( label2,1,0 );
+ colorgrouplayout->addWidget( m_ccBgcolor,0,1 );
+ colorgrouplayout->addWidget( m_ccTextcolor,1,1 );
// alignment group
TQButtonGroup *aligngroup = new TQButtonGroup( i18n("Alignment"),page);
aligngroup->setColumnLayout(0, Qt::Vertical );
- aligngroup->tqlayout()->setSpacing( 6 );
- aligngroup->tqlayout()->setMargin( 11 );
+ aligngroup->layout()->setSpacing( 6 );
+ aligngroup->layout()->setMargin( 11 );
m_rbAlignleft = new TQRadioButton(i18n("Left"),aligngroup);
m_rbAligncenter = new TQRadioButton(i18n("Center"),aligngroup);
m_rbAlignright = new TQRadioButton(i18n("Right"),aligngroup);
- TQVBoxLayout *aligngrouptqlayout = new TQVBoxLayout( aligngroup->tqlayout() );
- aligngrouptqlayout->setAlignment( TQt::AlignTop );
- aligngrouptqlayout->addWidget( m_rbAlignleft );
- aligngrouptqlayout->addWidget( m_rbAligncenter );
- aligngrouptqlayout->addWidget( m_rbAlignright );
+ TQVBoxLayout *aligngrouplayout = new TQVBoxLayout( aligngroup->layout() );
+ aligngrouplayout->setAlignment( TQt::AlignTop );
+ aligngrouplayout->addWidget( m_rbAlignleft );
+ aligngrouplayout->addWidget( m_rbAligncenter );
+ aligngrouplayout->addWidget( m_rbAlignright );
// frame group
TQGroupBox *framegroup = new TQGroupBox( i18n("Frame"),page);
framegroup->setColumnLayout(0, Qt::Vertical );
- framegroup->tqlayout()->setSpacing( 6 );
- framegroup->tqlayout()->setMargin( 11 );
+ framegroup->layout()->setSpacing( 6 );
+ framegroup->layout()->setMargin( 11 );
TQLabel *label3 = new TQLabel(i18n("Standard:"),framegroup);
TQLabel *label4 = new TQLabel(i18n("User defined:"),framegroup);
@@ -339,45 +339,45 @@ TabCellDialog::TabCellDialog(TQWidget *parent, TabularCell::Data *data,
borderbox->addWidget(m_cellframe);
borderbox->addStretch(1);
- TQVBoxLayout *framegrouptqlayout = new TQVBoxLayout( framegroup->tqlayout() );
- framegrouptqlayout->setAlignment( TQt::AlignTop );
- framegrouptqlayout->addWidget( label3 );
- framegrouptqlayout->addWidget( lineframe );
- framegrouptqlayout->addSpacing( 10 );
- framegrouptqlayout->addWidget( label4 );
- framegrouptqlayout->addWidget( borderframe );
+ TQVBoxLayout *framegrouplayout = new TQVBoxLayout( framegroup->layout() );
+ framegrouplayout->setAlignment( TQt::AlignTop );
+ framegrouplayout->addWidget( label3 );
+ framegrouplayout->addWidget( lineframe );
+ framegrouplayout->addSpacing( 10 );
+ framegrouplayout->addWidget( label4 );
+ framegrouplayout->addWidget( borderframe );
// preamble group
TQGroupBox *preamblegroup = new TQGroupBox( i18n("Preamble"),page);
preamblegroup->setColumnLayout(0, Qt::Vertical );
- preamblegroup->tqlayout()->setSpacing( 6 );
- preamblegroup->tqlayout()->setMargin( 11 );
+ preamblegroup->layout()->setSpacing( 6 );
+ preamblegroup->layout()->setMargin( 11 );
m_cbPre = new TQCheckBox(i18n(">{decl}: insert before"),preamblegroup,"cb_pre");
m_cbPost = new TQCheckBox(i18n("<{decl}: insert after"),preamblegroup,"cb_post");
m_cbAt = new TQCheckBox(i18n("@{decl}: suppress space"),preamblegroup,"cb_at");
m_cbSep = new TQCheckBox(i18n("!{decl}: do not suppress space"),preamblegroup,"cb_sep");
- TQVBoxLayout *preamblegrouptqlayout = new TQVBoxLayout( preamblegroup->tqlayout() );
- preamblegrouptqlayout->setAlignment( TQt::AlignTop );
- preamblegrouptqlayout->addWidget( m_cbPre );
- preamblegrouptqlayout->addWidget( m_cbPost );
- preamblegrouptqlayout->addWidget( m_cbAt );
- preamblegrouptqlayout->addWidget( m_cbSep );
+ TQVBoxLayout *preamblegrouplayout = new TQVBoxLayout( preamblegroup->layout() );
+ preamblegrouplayout->setAlignment( TQt::AlignTop );
+ preamblegrouplayout->addWidget( m_cbPre );
+ preamblegrouplayout->addWidget( m_cbPost );
+ preamblegrouplayout->addWidget( m_cbAt );
+ preamblegrouplayout->addWidget( m_cbSep );
// header group
TQGroupBox *headergroup = new TQGroupBox( i18n("Alignment"),page);
headergroup->setColumnLayout(0, Qt::Vertical );
- headergroup->tqlayout()->setSpacing( 6 );
- headergroup->tqlayout()->setMargin( 11 );
+ headergroup->layout()->setSpacing( 6 );
+ headergroup->layout()->setMargin( 11 );
m_coHeader = new TQComboBox(headergroup);
- TQVBoxLayout *headergrouptqlayout = new TQVBoxLayout( headergroup->tqlayout() );
- headergrouptqlayout->setAlignment( TQt::AlignTop );
- headergrouptqlayout->addStretch(1);
- headergrouptqlayout->addWidget(m_coHeader);
- headergrouptqlayout->addStretch(1);
+ TQVBoxLayout *headergrouplayout = new TQVBoxLayout( headergroup->layout() );
+ headergrouplayout->setAlignment( TQt::AlignTop );
+ headergrouplayout->addStretch(1);
+ headergrouplayout->addWidget(m_coHeader);
+ headergrouplayout->addStretch(1);
// add widgets
if ( m_header )
@@ -1045,7 +1045,7 @@ void TabularTable::paintCell( TQPainter *p, int row, int col,
TQPen pen( p->pen() );
TQColor gridlinecolor;
- int gridColor = tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, this );
+ int gridColor = style().styleHint( TQStyle::SH_Table_GridLineColor, this );
if (gridColor != -1)
{
const TQPalette &pal = palette();
@@ -1850,8 +1850,8 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
// environment group
TQButtonGroup *group = new TQButtonGroup( i18n("Environment"),page);
group->setColumnLayout(0, Qt::Vertical );
- group->tqlayout()->setSpacing( 4 );
- group->tqlayout()->setMargin( 11 );
+ group->layout()->setSpacing( 4 );
+ group->layout()->setMargin( 11 );
TQLabel *label1 = new TQLabel(i18n("&Name:"),group);
TQLabel *label2 = new TQLabel(i18n("&Parameter:"),group);
@@ -1867,26 +1867,26 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
m_cbCenter = new TQCheckBox(i18n("C&enter"),group);
m_cbBullets = new TQCheckBox(i18n("Insert &bullets"),group);
- TQGridLayout *grouptqlayout = new TQGridLayout( group->tqlayout() );
- grouptqlayout->setAlignment( TQt::AlignTop );
- grouptqlayout->setColStretch(5,1);
- grouptqlayout->addWidget( label1, 0,0 );
- grouptqlayout->addWidget( label2, 1,0 );
- grouptqlayout->addWidget( m_coEnvironment, 0,1 );
- grouptqlayout->addWidget( m_coParameter, 1,1 );
- grouptqlayout->setColSpacing(2,24);
- grouptqlayout->addWidget( label3, 0,3 );
- grouptqlayout->addWidget( label4, 1,3 );
- grouptqlayout->addWidget( m_spRows, 0,4 );
- grouptqlayout->addWidget( m_spCols, 1,4 );
- grouptqlayout->setRowSpacing(2,8);
-
- grouptqlayout->addMultiCellWidget( m_cbWarning, 3,3,0,4, TQt::AlignLeft );
-
- grouptqlayout->addMultiCellWidget( m_cbStarred, 4,4,0,1, TQt::AlignLeft );
- grouptqlayout->addMultiCellWidget( m_cbBooktabs, 5,5,0,1, TQt::AlignLeft );
- grouptqlayout->addMultiCellWidget( m_cbCenter, 4,4,3,4, TQt::AlignLeft );
- grouptqlayout->addMultiCellWidget( m_cbBullets, 5,5,3,4, TQt::AlignLeft );
+ TQGridLayout *grouplayout = new TQGridLayout( group->layout() );
+ grouplayout->setAlignment( TQt::AlignTop );
+ grouplayout->setColStretch(5,1);
+ grouplayout->addWidget( label1, 0,0 );
+ grouplayout->addWidget( label2, 1,0 );
+ grouplayout->addWidget( m_coEnvironment, 0,1 );
+ grouplayout->addWidget( m_coParameter, 1,1 );
+ grouplayout->setColSpacing(2,24);
+ grouplayout->addWidget( label3, 0,3 );
+ grouplayout->addWidget( label4, 1,3 );
+ grouplayout->addWidget( m_spRows, 0,4 );
+ grouplayout->addWidget( m_spCols, 1,4 );
+ grouplayout->setRowSpacing(2,8);
+
+ grouplayout->addMultiCellWidget( m_cbWarning, 3,3,0,4, TQt::AlignLeft );
+
+ grouplayout->addMultiCellWidget( m_cbStarred, 4,4,0,1, TQt::AlignLeft );
+ grouplayout->addMultiCellWidget( m_cbBooktabs, 5,5,0,1, TQt::AlignLeft );
+ grouplayout->addMultiCellWidget( m_cbCenter, 4,4,3,4, TQt::AlignLeft );
+ grouplayout->addMultiCellWidget( m_cbBullets, 5,5,3,4, TQt::AlignLeft );
// add widgets
vbox->addWidget( m_table);
@@ -1924,7 +1924,7 @@ TabularDialog::TabularDialog(TQWidget *parent, KConfig *config, KileDocument::La
connect( m_spCols, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotColValueChanged(int)));
TQWhatsThis::add(m_table,i18n("Input data. When you press Enter, the cursor will move to the cell right of the current cell. A click with the right mouse button on a cell or a range of cells will open a popup menu, where you can edit attributes, clear attributes, delete text or define multicolumn cells."));
- TQWhatsThis::add(m_table->horizontalHeader(),i18n("Current tqlayout of the preamble. A click with the right mouse button will open a popup menu, where you can edit some attributes of all cells, which belong to the selected columns."));
+ TQWhatsThis::add(m_table->horizontalHeader(),i18n("Current layout of the preamble. A click with the right mouse button will open a popup menu, where you can edit some attributes of all cells, which belong to the selected columns."));
TQWhatsThis::add(m_table->verticalHeader(),i18n("A click with the right mouse button will open a popup menu, where you can edit some attributes of all cells, which belong to the selected rows."));
TQWhatsThis::add(m_coEnvironment,i18n("Choose an environment."));
TQWhatsThis::add(m_coParameter,i18n("Optional parameter for the chosen environment."));
diff --git a/src/kile/texdocdialog.cpp b/src/kile/texdocdialog.cpp
index 385a805..17ee738 100644
--- a/src/kile/texdocdialog.cpp
+++ b/src/kile/texdocdialog.cpp
@@ -71,9 +71,9 @@ TexDocDialog::TexDocDialog(TQWidget *parent, const char *name)
TQGroupBox *groupbox = new TQGroupBox( i18n("Search"), page, "groupbox" );
groupbox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, groupbox->sizePolicy().hasHeightForWidth() ) );
groupbox->setColumnLayout(0, Qt::Vertical );
- groupbox->tqlayout()->setSpacing( 6 );
- groupbox->tqlayout()->setMargin( 11 );
- TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->tqlayout() );
+ groupbox->layout()->setSpacing( 6 );
+ groupbox->layout()->setMargin( 11 );
+ TQGridLayout *groupboxLayout = new TQGridLayout( groupbox->layout() );
groupboxLayout->setAlignment( TQt::AlignTop );
TQLabel *label = new TQLabel( i18n("&Keyword:"), groupbox, "label");
diff --git a/src/kile/userhelpdialog.cpp b/src/kile/userhelpdialog.cpp
index 41e5fa8..a097925 100644
--- a/src/kile/userhelpdialog.cpp
+++ b/src/kile/userhelpdialog.cpp
@@ -49,7 +49,7 @@ UserHelpDialog::UserHelpDialog(TQWidget *parent, const char *name)
TQWidget *page = new TQWidget(this);
setMainWidget(page);
- // tqlayout
+ // layout
TQVBoxLayout *vbox = new TQVBoxLayout(page, 6,6 );
TQVGroupBox* group= new TQVGroupBox(i18n("User Help"),page );
@@ -349,7 +349,7 @@ UserHelpAddDialog::UserHelpAddDialog(KListBox *menulistbox, TQWidget *parent, co
TQWidget *page = new TQWidget(this);
setMainWidget(page);
- // tqlayout
+ // layout
TQVBoxLayout *vbox = new TQVBoxLayout(page, 6,6 );
TQVGroupBox* group= new TQVGroupBox(i18n("User Help"),page );