summaryrefslogtreecommitdiffstats
path: root/parts
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-21 14:24:21 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-23 19:35:21 +0200
commit39d7cb00553d01cea32bfd52fa406aac15742ba0 (patch)
tree5c385fb00eec3e82327af85dca39e730faa5cebe /parts
parentec049c7c32d50faf317b13d5c844a19978881fc3 (diff)
downloadtdevelop-39d7cb00553d01cea32bfd52fa406aac15742ba0.tar.gz
tdevelop-39d7cb00553d01cea32bfd52fa406aac15742ba0.zip
Rename obsolete tq methods to standard names
(cherry picked from commit abcbb684982167791304dc2fe0bc979489506b43)
Diffstat (limited to 'parts')
-rw-r--r--parts/abbrev/abbrevconfigwidgetbase.ui2
-rw-r--r--parts/appwizard/appwizarddlgbase.ui10
-rw-r--r--parts/appwizard/common/incadmin/ltmain.sh2
-rw-r--r--parts/astyle/astyleconfig.ui4
-rw-r--r--parts/bookmarks/bookmarks_settings_base.ui4
-rw-r--r--parts/classview/classtooldlg.cpp8
-rw-r--r--parts/classview/hierarchydlg.cpp6
-rw-r--r--parts/ctags2/ctags2_createtagfilebase.ui2
-rw-r--r--parts/ctags2/ctags2_selecttagfilebase.ui2
-rw-r--r--parts/ctags2/ctags2_settingswidgetbase.ui4
-rw-r--r--parts/ctags2/ctags2_widgetbase.ui2
-rw-r--r--parts/diff/diffdlg.cpp4
-rw-r--r--parts/diff/diffwidget.cpp6
-rw-r--r--parts/distpart/distpart_ui.ui14
-rw-r--r--parts/documentation/addcatalogdlgbase.ui2
-rw-r--r--parts/documentation/docglobalconfigwidgetbase.ui4
-rw-r--r--parts/documentation/editcatalogdlgbase.ui2
-rw-r--r--parts/documentation/interfaces/kdevdocumentationplugin.cpp6
-rw-r--r--parts/doxygen/config.cpp10
-rw-r--r--parts/doxygen/input.cpp52
-rw-r--r--parts/filecreate/fctemplateeditbase.ui6
-rw-r--r--parts/filecreate/fctypeeditbase.ui10
-rw-r--r--parts/filecreate/file-templates/ui-dialogb-qt44
-rw-r--r--parts/filecreate/file-templates/ui-dialogr-qt44
-rw-r--r--parts/fileview/addfilegroupdlg.cpp10
-rw-r--r--parts/fileview/partwidget.cpp2
-rw-r--r--parts/filter/shellfilterdlg.cpp8
-rw-r--r--parts/filter/shellinsertdlg.cpp8
-rw-r--r--parts/grepview/grepdlg.cpp34
-rw-r--r--parts/grepview/grepviewwidget.cpp4
-rw-r--r--parts/outputviews/appoutputwidget.cpp2
-rw-r--r--parts/outputviews/makewidget.cpp2
-rw-r--r--parts/partexplorer/partexplorerform.cpp2
-rw-r--r--parts/quickopen/quickopenfunctionchooseformbase.ui4
-rw-r--r--parts/regexptest/regexptestdlgbase.ui2
-rw-r--r--parts/replace/replace_widget.cpp10
-rw-r--r--parts/replace/replacedlg.ui4
-rw-r--r--parts/replace/replaceitem.cpp4
-rw-r--r--parts/snippet/snippet_widget.cpp22
-rw-r--r--parts/snippet/snippetdlg.ui4
-rw-r--r--parts/snippet/snippetsettingsbase.ui2
-rw-r--r--parts/tools/kapplicationtree.cpp2
-rw-r--r--parts/uimode/uichooser.ui4
-rw-r--r--parts/valgrind/dialog_widget.ui6
44 files changed, 153 insertions, 153 deletions
diff --git a/parts/abbrev/abbrevconfigwidgetbase.ui b/parts/abbrev/abbrevconfigwidgetbase.ui
index fcce2dad..fd04ec23 100644
--- a/parts/abbrev/abbrevconfigwidgetbase.ui
+++ b/parts/abbrev/abbrevconfigwidgetbase.ui
@@ -45,7 +45,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui
index 0989be1b..525aeef0 100644
--- a/parts/appwizard/appwizarddlgbase.ui
+++ b/parts/appwizard/appwizarddlgbase.ui
@@ -179,7 +179,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -219,7 +219,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -345,7 +345,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<vbox>
<property name="name">
@@ -388,7 +388,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -422,7 +422,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh
index 0cb90869..3506ead3 100644
--- a/parts/appwizard/common/incadmin/ltmain.sh
+++ b/parts/appwizard/common/incadmin/ltmain.sh
@@ -4565,7 +4565,7 @@ func_mode_link ()
continue
;;
- # Tru64 UNIX uses -model [arg] to determine the tqlayout of C++
+ # Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
-model|-arch|-isysroot)
diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui
index f94da081..fd68fe48 100644
--- a/parts/astyle/astyleconfig.ui
+++ b/parts/astyle/astyleconfig.ui
@@ -322,7 +322,7 @@ Can use * on its own for any file.</string>
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -473,7 +473,7 @@ The number of spaces per tab is controled by the editor.</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
diff --git a/parts/bookmarks/bookmarks_settings_base.ui b/parts/bookmarks/bookmarks_settings_base.ui
index 092cc754..e23e55f4 100644
--- a/parts/bookmarks/bookmarks_settings_base.ui
+++ b/parts/bookmarks/bookmarks_settings_base.ui
@@ -49,7 +49,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -137,7 +137,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index 1a92866c..df51f6f4 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -86,11 +86,11 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
class_tree = new ClassToolWidget(part, this);
// classTree->setMinimumSize( 500, 400 );
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQHBoxLayout *firstrowLayout = new TQHBoxLayout();
TQHBoxLayout *secondrowLayout = new TQHBoxLayout();
- tqlayout->addLayout(firstrowLayout);
- tqlayout->addLayout(secondrowLayout);
+ layout->addLayout(firstrowLayout);
+ layout->addLayout(secondrowLayout);
firstrowLayout->addWidget(class_combo, 1);
firstrowLayout->addWidget(close_button, 0);
@@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
secondrowLayout->addWidget(attributes_button);
secondrowLayout->addWidget(access_combo);
- tqlayout->addWidget(class_tree, 10);
+ layout->addWidget(class_tree, 10);
connect( class_combo, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotClassComboChoice(const TQString&)) );
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index f5fc3e6a..9fdff34c 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -55,16 +55,16 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part )
digraph = new DigraphView(splitter, "digraph view");
// member_tree = new ClassToolWidget(part, splitter);
- TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
TQBoxLayout *combo_layout = new TQHBoxLayout();
- tqlayout->addLayout(combo_layout);
+ layout->addLayout(combo_layout);
combo_layout->addWidget(namespace_combo);
combo_layout->addWidget(class_combo);
combo_layout->addSpacing(60);
combo_layout->addWidget(refresh_button);
combo_layout->addWidget(save_button);
combo_layout->addWidget(close_button);
- tqlayout->addWidget(splitter);
+ layout->addWidget(splitter);
connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)),
this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) );
diff --git a/parts/ctags2/ctags2_createtagfilebase.ui b/parts/ctags2/ctags2_createtagfilebase.ui
index c6145eed..c60f9145 100644
--- a/parts/ctags2/ctags2_createtagfilebase.ui
+++ b/parts/ctags2/ctags2_createtagfilebase.ui
@@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/ctags2/ctags2_selecttagfilebase.ui b/parts/ctags2/ctags2_selecttagfilebase.ui
index 6bffedfe..c06582b8 100644
--- a/parts/ctags2/ctags2_selecttagfilebase.ui
+++ b/parts/ctags2/ctags2_selecttagfilebase.ui
@@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui
index 59c1ba32..c96d04a2 100644
--- a/parts/ctags2/ctags2_settingswidgetbase.ui
+++ b/parts/ctags2/ctags2_settingswidgetbase.ui
@@ -214,7 +214,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<grid>
<property name="name">
@@ -248,7 +248,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
- <cstring>tqlayout21</cstring>
+ <cstring>layout21</cstring>
</property>
<grid>
<property name="name">
diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui
index 19fc4b85..465958df 100644
--- a/parts/ctags2/ctags2_widgetbase.ui
+++ b/parts/ctags2/ctags2_widgetbase.ui
@@ -71,7 +71,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp
index f461182e..e5a8c74d 100644
--- a/parts/diff/diffdlg.cpp
+++ b/parts/diff/diffdlg.cpp
@@ -22,8 +22,8 @@ DiffDlg::DiffDlg( TQWidget *parent, const char *name ):
diffWidget = new DiffWidget( this, "Main Diff Widget" );
setMainWidget( diffWidget );
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, spacingHint() );
- tqlayout->addWidget( diffWidget );
+ TQVBoxLayout* layout = new TQVBoxLayout( this, 0, spacingHint() );
+ layout->addWidget( diffWidget );
}
DiffDlg::~DiffDlg()
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 4c8fb488..66ea3293 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -192,8 +192,8 @@ DiffWidget::DiffWidget( DiffPart * part, TQWidget *parent, const char *name, WFl
// te->setMinimumSize( 300, 200 );
connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) );
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
- tqlayout->addWidget( te );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
+ layout->addWidget( te );
}
DiffWidget::~DiffWidget()
@@ -233,7 +233,7 @@ void DiffWidget::loadExtPart( const TQString& partName )
if ( !extPart || !extPart->widget() )
return;
- tqlayout()->add( extPart->widget() );
+ layout()->add( extPart->widget() );
setExtPartVisible( true );
diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui
index b16d358e..c1faf402 100644
--- a/parts/distpart/distpart_ui.ui
+++ b/parts/distpart/distpart_ui.ui
@@ -314,7 +314,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout12</cstring>
+ <cstring>layout12</cstring>
</property>
<hbox>
<property name="name">
@@ -322,7 +322,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<grid>
<property name="name">
@@ -646,7 +646,7 @@ changes project compiled version number</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout13</cstring>
+ <cstring>layout13</cstring>
</property>
<vbox>
<property name="name">
@@ -654,7 +654,7 @@ changes project compiled version number</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<vbox>
<property name="name">
@@ -702,7 +702,7 @@ Build Files</string>
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<hbox>
<property name="name">
@@ -710,7 +710,7 @@ Build Files</string>
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@@ -755,7 +755,7 @@ Build Files</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<vbox>
<property name="name">
diff --git a/parts/documentation/addcatalogdlgbase.ui b/parts/documentation/addcatalogdlgbase.ui
index 77c7f613..8b67c4fa 100644
--- a/parts/documentation/addcatalogdlgbase.ui
+++ b/parts/documentation/addcatalogdlgbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout20</cstring>
+ <cstring>layout20</cstring>
</property>
<grid>
<property name="name">
diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui
index e2a176dd..5efa3b92 100644
--- a/parts/documentation/docglobalconfigwidgetbase.ui
+++ b/parts/documentation/docglobalconfigwidgetbase.ui
@@ -60,7 +60,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -141,7 +141,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
diff --git a/parts/documentation/editcatalogdlgbase.ui b/parts/documentation/editcatalogdlgbase.ui
index e7799a12..d0d11779 100644
--- a/parts/documentation/editcatalogdlgbase.ui
+++ b/parts/documentation/editcatalogdlgbase.ui
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index d294db6f..15d0d0a9 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -209,7 +209,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
p->fillRect(0, 0, width, height(), cg.brush(crole));
TQFontMetrics fm(lv->fontMetrics());
- int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int styleflags = TQStyle::Style_Default;
@@ -229,7 +229,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
y = (fm.height() + 2 + marg - boxsize) / 2;
TQStyleOption opt(this);
- lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
+ lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
TQRect(x, y, boxsize, fm.height() + 2 + marg), cg, styleflags, opt);
return;
@@ -240,7 +240,7 @@ void ConfigurationItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colu
int ConfigurationItem::width(const TQFontMetrics &fm, const TQListView *lv, int c) const
{
if ((c == 0) || (c == 1) || (c == 2))
- return lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
+ return lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv) + 4;
return TQListViewItem::width(fm, lv, c);
}
diff --git a/parts/doxygen/config.cpp b/parts/doxygen/config.cpp
index df9ce30c..d290fbfe 100644
--- a/parts/doxygen/config.cpp
+++ b/parts/doxygen/config.cpp
@@ -3773,12 +3773,12 @@ void Config::create()
);
cs->setWidgetType(ConfigString::File);
cs = addString( "LAYOUT_FILE",
- "The LAYOUT_FILE tag can be used to specify a tqlayout file which will be parsed by \n"
- "doxygen. The tqlayout file controls the global structure of the generated output files \n"
- "in an output format independent way. The create the tqlayout file that represents \n"
+ "The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by \n"
+ "doxygen. The layout file controls the global structure of the generated output files \n"
+ "in an output format independent way. The create the layout file that represents \n"
"doxygen's defaults, run doxygen with the -l option. You can optionally specify a \n"
"file name after the option, if omitted DoxygenLayout.xml will be used as the name \n"
- "of the tqlayout file.\n"
+ "of the layout file.\n"
);
cs->setWidgetType(ConfigString::File);
addObsolete("DETAILS_AT_TOP");
@@ -4857,7 +4857,7 @@ void Config::create()
cs = addString( "DOT_FONTNAME",
"By default doxygen will write a font called FreeSans.ttf to the output \n"
"directory and reference it in all dot files that doxygen generates. This \n"
- "font does not include all possible tqunicode characters however, so when you need \n"
+ "font does not include all possible unicode characters however, so when you need \n"
"these (or just want a differently looking font) you can specify the font name \n"
"using DOT_FONTNAME. You need need to make sure dot is able to find the font, \n"
"which can be done by putting it in a standard location or by setting the \n"
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index 2904ca0a..5dcddf0b 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -113,13 +113,13 @@ const char **update_xpm = (const char **)update_xpm_data;
InputBool::InputBool(const TQCString &k, const TQString &text, TQWidget * parent, bool &flag)
: TQWidget(parent), state(flag), key(k)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+ TQHBoxLayout *layout = new TQHBoxLayout(this);
cb = new TQCheckBox(text,this);
init();
- tqlayout->addWidget(cb);
- tqlayout->addStretch(1);
+ layout->addWidget(cb);
+ layout->addStretch(1);
connect( cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(valueChanged(bool)));
}
@@ -154,16 +154,16 @@ void InputBool::setEnabled(bool b)
InputInt::InputInt(const TQString &label, TQWidget *parent, int &val, int minVal, int maxVal)
: TQWidget(parent), m_val(val), m_minVal(minVal), m_maxVal(maxVal)
{
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
+ TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
sp = new TQSpinBox(minVal, maxVal, 1, this);
lab = new TQLabel(sp, label+":", this);
init();
- tqlayout->addWidget(lab);
- tqlayout->addWidget(sp);
- tqlayout->addStretch(1);
+ layout->addWidget(lab);
+ layout->addWidget(sp);
+ layout->addStretch(1);
connect(sp, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
}
@@ -203,25 +203,25 @@ InputString::InputString(const TQString & label,
le = 0; br = 0; com = 0;
if (m == StringFixed) {
- TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 5);
+ TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
com = new TQComboBox(this);
lab = new TQLabel(com,label+":", this);
- tqlayout->addWidget(lab);
- tqlayout->addWidget(com);
- tqlayout->addStretch(1);
+ layout->addWidget(lab);
+ layout->addWidget(com);
+ layout->addStretch(1);
} else {
- TQGridLayout *tqlayout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
+ TQGridLayout *layout = new TQGridLayout(this, 1, m==StringFree? 1 : 3, 5);
le = new KLineEdit(this);
lab = new TQLabel(le,label+":", this);
- tqlayout->addWidget(lab, 0, 0);
+ layout->addWidget(lab, 0, 0);
le->setText(s);
- tqlayout->addWidget(le, 0, 1);
+ layout->addWidget(le, 0, 1);
if (m == StringFile || m == StringDir) {
br = new TQPushButton(this);
br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
- tqlayout->addWidget(br, 0, 2);
+ layout->addWidget(br, 0, 2);
}
}
@@ -327,29 +327,29 @@ InputStrList::InputStrList(const TQString & label,
TQWidget *parent, TQStrList &sl, ListMode lm)
: TQWidget(parent), strList(sl)
{
- TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2, 5);
+ TQGridLayout *layout = new TQGridLayout(this, 2, 2, 5);
TQWidget *dw = new TQWidget(this); /* dummy widget used for layouting */
- TQHBoxLayout *boxtqlayout = new TQHBoxLayout(dw, 0, 5);
+ TQHBoxLayout *boxlayout = new TQHBoxLayout(dw, 0, 5);
le = new KLineEdit(dw);
lab = new TQLabel(le,label+":", this );
- tqlayout->addWidget(lab, 0, 0);
- boxtqlayout->addWidget(le, 1);
+ layout->addWidget(lab, 0, 0);
+ boxlayout->addWidget(le, 1);
add = new TQPushButton(dw);
add->setPixmap(TQPixmap( add_xpm ));
TQToolTip::add(add, i18n("Add item"));
- boxtqlayout->addWidget(add);
+ boxlayout->addWidget(add);
del = new TQPushButton(dw);
del->setPixmap(TQPixmap( del_xpm ));
TQToolTip::add(del, i18n("Delete selected item"));
- boxtqlayout->addWidget(del);
+ boxlayout->addWidget(del);
upd = new TQPushButton(dw);
upd->setPixmap(TQPixmap( update_xpm ));
TQToolTip::add(upd, i18n("Update selected item"));
- boxtqlayout->addWidget(upd);
+ boxlayout->addWidget(upd);
lb = new TQListBox(this);
lb->setMinimumSize(400, 100);
@@ -364,17 +364,17 @@ InputStrList::InputStrList(const TQString & label,
brFile = new TQPushButton(dw);
brFile->setPixmap(SmallIcon("document"));
TQToolTip::add(brFile, i18n("Browse to a file"));
- boxtqlayout->addWidget(brFile);
+ boxlayout->addWidget(brFile);
}
if (lm & ListDir) {
brDir = new TQPushButton(dw);
brDir->setPixmap(SmallIcon("folder"));
TQToolTip::add(brDir, i18n("Browse to a folder"));
- boxtqlayout->addWidget(brDir);
+ boxlayout->addWidget(brDir);
}
}
- tqlayout->addWidget(dw, 0, 1);
- tqlayout->addWidget(lb, 1, 1);
+ layout->addWidget(dw, 0, 1);
+ layout->addWidget(lb, 1, 1);
connect( le, TQT_SIGNAL(returnPressed()),
this, TQT_SLOT(addString()) );
diff --git a/parts/filecreate/fctemplateeditbase.ui b/parts/filecreate/fctemplateeditbase.ui
index eef54b8f..df15692c 100644
--- a/parts/filecreate/fctemplateeditbase.ui
+++ b/parts/filecreate/fctemplateeditbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -56,7 +56,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -110,7 +110,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/filecreate/fctypeeditbase.ui b/parts/filecreate/fctypeeditbase.ui
index 2a9f23f8..9d97d82b 100644
--- a/parts/filecreate/fctypeeditbase.ui
+++ b/parts/filecreate/fctypeeditbase.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -91,7 +91,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout3_2</cstring>
+ <cstring>layout3_2</cstring>
</property>
<vbox>
<property name="name">
@@ -140,7 +140,7 @@
</widget>
<widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -194,7 +194,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4
index 57cc1a9c..33167acc 100644
--- a/parts/filecreate/file-templates/ui-dialogb-qt4
+++ b/parts/filecreate/file-templates/ui-dialogb-qt4
@@ -24,7 +24,7 @@
<height>33</height>
</rect>
</property>
- <tqlayout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
+ <layout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
<property name="margin" >
<number>0</number>
</property>
@@ -58,7 +58,7 @@
</property>
</widget>
</item>
- </tqlayout>
+ </layout>
</widget>
</widget>
<pixmapfunction></pixmapfunction>
diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4
index 1d3405eb..d047e11c 100644
--- a/parts/filecreate/file-templates/ui-dialogr-qt4
+++ b/parts/filecreate/file-templates/ui-dialogr-qt4
@@ -24,7 +24,7 @@
<height>106</height>
</rect>
</property>
- <tqlayout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
+ <layout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
<property name="margin" >
<number>0</number>
</property>
@@ -58,7 +58,7 @@
</property>
</spacer>
</item>
- </tqlayout>
+ </layout>
</widget>
</widget>
<pixmapfunction></pixmapfunction>
diff --git a/parts/fileview/addfilegroupdlg.cpp b/parts/fileview/addfilegroupdlg.cpp
index 9e45d1ae..b59f2ad2 100644
--- a/parts/fileview/addfilegroupdlg.cpp
+++ b/parts/fileview/addfilegroupdlg.cpp
@@ -35,10 +35,10 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
TQFontMetrics fm(pattern_edit->fontMetrics());
pattern_edit->setMinimumWidth(fm.width('X')*35);
connect( pattern_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
TQGridLayout *grid = new TQGridLayout(2, 2);
- tqlayout->addLayout(grid);
+ layout->addLayout(grid);
grid->addWidget(title_label, 0, 0);
grid->addWidget(title_edit, 0, 1);
grid->addWidget(pattern_label, 1, 0);
@@ -46,7 +46,7 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
TQFrame *frame = new TQFrame(this);
frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
- tqlayout->addWidget(frame, 0);
+ layout->addWidget(frame, 0);
KButtonBox *buttonbox = new KButtonBox(this);
buttonbox->addStretch();
@@ -56,8 +56,8 @@ AddFileGroupDialog::AddFileGroupDialog(const TQString& old_title, const TQString
m_pOk->setDefault(true);
connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
- buttonbox->tqlayout();
- tqlayout->addWidget(buttonbox, 0);
+ buttonbox->layout();
+ layout->addWidget(buttonbox, 0);
slotTextChanged();
}
diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp
index e292ca2d..5105de93 100644
--- a/parts/fileview/partwidget.cpp
+++ b/parts/fileview/partwidget.cpp
@@ -50,7 +50,7 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent )
m_filetree->setIcon(SmallIcon("folder"));
TQWhatsThis::add(m_filetree, i18n("<b>File tree</b><p>"
"The file viewer shows all files of the project "
- "in a tree tqlayout."));
+ "in a tree layout."));
TQHBox* filterBox = new TQHBox( this );
m_btnFilter = new TQToolButton( filterBox );
diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp
index 9847ed61..484cb4cc 100644
--- a/parts/filter/shellfilterdlg.cpp
+++ b/parts/filter/shellfilterdlg.cpp
@@ -31,18 +31,18 @@
ShellFilterDialog::ShellFilterDialog()
: TQDialog(0, "shell filter dialog", true)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
combo = new TQComboBox(true, this);
combo->setDuplicatesEnabled(false);
- tqlayout->addWidget(combo);
+ layout->addWidget(combo);
KButtonBox *buttonbox = new KButtonBox(this);
start_button = buttonbox->addButton(i18n("&Start"));
start_button->setDefault(true);
cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
- buttonbox->tqlayout();
- tqlayout->addWidget(buttonbox);
+ buttonbox->layout();
+ layout->addWidget(buttonbox);
connect( start_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotStartClicked()) );
diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp
index 9a889651..e36278b5 100644
--- a/parts/filter/shellinsertdlg.cpp
+++ b/parts/filter/shellinsertdlg.cpp
@@ -32,18 +32,18 @@
ShellInsertDialog::ShellInsertDialog()
: TQDialog(0, "shell filter dialog", true)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4);
combo = new TQComboBox(true, this);
combo->setDuplicatesEnabled(false);
- tqlayout->addWidget(combo);
+ layout->addWidget(combo);
KButtonBox *buttonbox = new KButtonBox(this);
start_button = buttonbox->addButton(i18n("&Start"));
start_button->setDefault(true);
cancel_button = buttonbox->addButton(KStdGuiItem::cancel());
- buttonbox->tqlayout();
- tqlayout->addWidget(buttonbox);
+ buttonbox->layout();
+ layout->addWidget(buttonbox);
connect( start_button, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotStartClicked()) );
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);
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index f4e099bc..12753745 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -339,7 +339,7 @@ void AppOutputWidget::copySelected()
if (isSelected(i))
buffer += item(i)->text() + "\n";
}
- kapp->tqclipboard()->setText(buffer, TQClipboard::Clipboard);
+ kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
}
void AppOutputWidget::addPartialStderrLine(const TQCString & line)
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 64f393aa..c07bbcae 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -342,7 +342,7 @@ void MakeWidget::copy()
selection.replace("&quot;","\"");
selection.replace("&amp;","&");
- kapp->tqclipboard()->setText(selection, TQClipboard::Clipboard);
+ kapp->clipboard()->setText(selection, TQClipboard::Clipboard);
}
void MakeWidget::nextError()
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index fca90a1e..5a24c2ea 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -121,7 +121,7 @@ PartExplorerForm::PartExplorerForm( TQWidget *parent )
m_resultsList->sizePolicy().hasHeightForWidth() ) );
TQWhatsThis::add( m_resultsList, i18n("<b>Matching services</b><p>Results (if any) are shown grouped by matching service name.") );
m_base->resultsLabel->setBuddy(m_resultsList);
- m_base->tqlayout()->add( m_resultsList );
+ m_base->layout()->add( m_resultsList );
setMainWidget( m_base );
m_base->typeCombo->lineEdit()->setFocus();
diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui
index 06217d14..592eff07 100644
--- a/parts/quickopen/quickopenfunctionchooseformbase.ui
+++ b/parts/quickopen/quickopenfunctionchooseformbase.ui
@@ -72,7 +72,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -120,7 +120,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
diff --git a/parts/regexptest/regexptestdlgbase.ui b/parts/regexptest/regexptestdlgbase.ui
index da4b7b95..5649238c 100644
--- a/parts/regexptest/regexptestdlgbase.ui
+++ b/parts/regexptest/regexptestdlgbase.ui
@@ -226,7 +226,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp
index f4a19103..b24949ab 100644
--- a/parts/replace/replace_widget.cpp
+++ b/parts/replace/replace_widget.cpp
@@ -65,8 +65,8 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
_terminateOperation( false )
{
// setup outputview
- TQVBoxLayout * tqlayout = new TQVBoxLayout( this );
- TQHBoxLayout * buttontqlayout = new TQHBoxLayout( tqlayout );
+ TQVBoxLayout * layout = new TQVBoxLayout( this );
+ TQHBoxLayout * buttonlayout = new TQHBoxLayout( layout );
_cancel = new KPushButton( KStdGuiItem::cancel(), this );
_replace = new KPushButton( KGuiItem(i18n("Replace"),"filefind"), this );
@@ -74,11 +74,11 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part)
_cancel->setEnabled( false );
_replace->setEnabled( false );
- buttontqlayout->addWidget( _replace );
- buttontqlayout->addWidget( _cancel );
+ buttonlayout->addWidget( _replace );
+ buttonlayout->addWidget( _cancel );
_listview = new ReplaceView( this );
- tqlayout->addWidget( _listview );
+ layout->addWidget( _listview );
// setup signals
connect( m_dialog->find_button, TQT_SIGNAL( clicked() ), TQT_SLOT( find() ) );
diff --git a/parts/replace/replacedlg.ui b/parts/replace/replacedlg.ui
index 000a2a06..ce58234a 100644
--- a/parts/replace/replacedlg.ui
+++ b/parts/replace/replacedlg.ui
@@ -93,7 +93,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -200,7 +200,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/replace/replaceitem.cpp b/parts/replace/replaceitem.cpp
index b6ca0519..20471d67 100644
--- a/parts/replace/replaceitem.cpp
+++ b/parts/replace/replaceitem.cpp
@@ -90,7 +90,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
lv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) );
TQFontMetrics fm( lv->fontMetrics() );
- int boxsize = lv->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
+ int boxsize = lv->style().pixelMetric(TQStyle::PM_CheckListButtonSize, lv);
int marg = lv->itemMargin();
int r = marg;
@@ -116,7 +116,7 @@ void ReplaceItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column,
else
y = (fm.height() + 2 + marg - boxsize) / 2;
- lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
+ lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
TQRect(x, y, boxsize,
fm.height() + 2 + marg),
cg, styleflags, TQStyleOption(this));
diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index b55d43b5..c6ad678c 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -671,7 +671,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
TQDialog dlg(this);
dlg.setCaption(i18n("Enter Values for Variables"));
- TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+ TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
@@ -685,11 +685,11 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
labTop->sizePolicy().hasHeightForWidth() ) );
labTop->setText(i18n("Enter the replacement values for these variables:"));
layoutTop->addWidget(labTop, 0, 0);
- tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+ layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
int i = 0; //walk through the variable map and add
- for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main tqlayout
+ for ( it = map->begin(); it != map->end(); ++it ) { //a checkbox, a lable and a lineedit to the main layout
if (it.key() == _SnippetConfig.getDelimiter() + _SnippetConfig.getDelimiter())
continue;
@@ -716,7 +716,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
i++;
}
- tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+ layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
@@ -731,7 +731,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
btn2->sizePolicy().hasHeightForWidth() ) );
layoutBtn->addWidget( btn2, 0, 1 );
- tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+ layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
// --END-- building a dynamic dialog
//connect the buttons to the TQDialog default slots
@@ -780,7 +780,7 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
delete layoutTop;
delete layoutVar;
delete layoutBtn;
- delete tqlayout;
+ delete layout;
if (i==0) //if nothing happened this means, that there are no variables to translate
return true; //.. so just return OK
@@ -800,7 +800,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
TQDialog dlg(this);
dlg.setCaption(i18n("Enter Values for Variables"));
- TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
+ TQGridLayout * layout = new TQGridLayout( &dlg, 1, 1, 11, 6, "layout");
TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
@@ -812,7 +812,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
labTop = new TQLabel( &dlg, "label" );
layoutTop->addWidget(labTop, 0, 0);
labTop->setText(i18n("Enter the replacement values for %1:").arg( var ));
- tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
+ layout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
cb = new TQCheckBox( &dlg, "cbVar" );
@@ -832,7 +832,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
"If you use the same variable later, even in another snippet, the value entered to the right "
"will be the default value for that variable.") );
- tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
+ layout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
btn1->setText(i18n("&Cancel"));
@@ -843,7 +843,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
btn2->setDefault( TRUE );
layoutBtn->addWidget( btn2, 0, 1 );
- tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
+ layout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
te->setFocus();
// --END-- building a dynamic dialog
@@ -875,7 +875,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
delete layoutTop;
delete layoutVar;
delete layoutBtn;
- delete tqlayout;
+ delete layout;
return strReturn;
}
diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui
index 44bfe88f..3606549b 100644
--- a/parts/snippet/snippetdlg.ui
+++ b/parts/snippet/snippetdlg.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -64,7 +64,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui
index e28d6ab7..7ae3bfc8 100644
--- a/parts/snippet/snippetsettingsbase.ui
+++ b/parts/snippet/snippetsettingsbase.ui
@@ -123,7 +123,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 58995d40..edf89043 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -248,7 +248,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i)
void KDevApplicationTree::resizeEvent( TQResizeEvent * e)
{
- setColumnWidth(0, width()-TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent));
+ setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent));
KListView::resizeEvent(e);
}
diff --git a/parts/uimode/uichooser.ui b/parts/uimode/uichooser.ui
index d86c0124..e66cc1a2 100644
--- a/parts/uimode/uichooser.ui
+++ b/parts/uimode/uichooser.ui
@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
diff --git a/parts/valgrind/dialog_widget.ui b/parts/valgrind/dialog_widget.ui
index 621f65d2..5da3365d 100644
--- a/parts/valgrind/dialog_widget.ui
+++ b/parts/valgrind/dialog_widget.ui
@@ -103,7 +103,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -149,7 +149,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -223,7 +223,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>tqlayout3_2</cstring>
+ <cstring>layout3_2</cstring>
</property>
<grid>
<property name="name">