summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
Diffstat (limited to 'kate')
-rw-r--r--kate/cppsymbolviewer/plugin_katesymbolviewer.cpp8
-rw-r--r--kate/cppsymbolviewer/plugin_katesymbolviewer.h2
-rw-r--r--kate/filetemplates/plugin/filetemplates.cpp6
-rw-r--r--kate/filetemplates/plugin/filetemplates.h2
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.cpp4
-rw-r--r--kate/insertcommand/plugin_kateinsertcommand.h2
-rw-r--r--kate/kjswrapper/plugin_katekjswrapper.cpp4
-rw-r--r--kate/kjswrapper/plugin_katekjswrapper.h2
-rw-r--r--kate/kjswrapper/samples/katekjstest1.js36
-rw-r--r--kate/kpybrowser/kpybrowser.cpp2
-rw-r--r--kate/snippets/CWidgetSnippetsBase.ui2
-rw-r--r--kate/tabbarextension/plugin_katetabbarextension.cpp4
-rw-r--r--kate/tabbarextension/plugin_katetabbarextension.h2
-rw-r--r--kate/xmltools/kde-docbook.dtd.xml2
-rw-r--r--kate/xmltools/plugin_katexmltools.cpp18
-rw-r--r--kate/xmltools/pseudo_dtd.cpp8
-rw-r--r--kate/xmltools/pseudo_dtd.h6
17 files changed, 55 insertions, 55 deletions
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index 5bf0906..8931bce 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -133,7 +133,7 @@ void KatePluginSymbolViewerView::slotInsertSymbol()
//connect(symbols, TQT_SIGNAL(resizeEvent(TQResizeEvent *)), this, TQT_SLOT(slotViewChanged(TQResizeEvent *)));
m_Active = true;
- //symbols->addColumn(i18n("Symbols"), symbols->tqparentWidget()->width());
+ //symbols->addColumn(i18n("Symbols"), symbols->parentWidget()->width());
symbols->addColumn(i18n("Symbols"));
symbols->addColumn(i18n("Position"));
symbols->setColumnWidthMode(1, TQListView::Manual);
@@ -192,7 +192,7 @@ void KatePluginSymbolViewerView::slotDocChanged()
void KatePluginSymbolViewerView::slotViewChanged(TQResizeEvent *)
{
kdDebug(13000)<<"View changed !!!!"<<endl;
- symbols->setColumnWidth(0, symbols->tqparentWidget()->width());
+ symbols->setColumnWidth(0, symbols->parentWidget()->width());
}
void KatePluginSymbolViewerView::slotShowContextMenu(TQListViewItem *, const TQPoint &p, int)
@@ -307,8 +307,8 @@ void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p )
// BEGIN KatePluginSymbolViewerConfigPage
KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage(
- TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
- : Kate::PluginConfigPage( tqparentWidget )
+ TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
+ : Kate::PluginConfigPage( parentWidget )
{
TQVBoxLayout* top = new TQVBoxLayout(this, 0,
KDialogBase::spacingHint());
diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
index d247852..9d0779f 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h
@@ -94,7 +94,7 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage
friend class KatePluginSymbolViewer;
public:
- KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+ KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
~KatePluginSymbolViewerConfigPage ();
/**
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 5d6649a..33639ce 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -504,7 +504,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
}
-TQWidget *KateFileTemplates::tqparentWindow()
+TQWidget *KateFileTemplates::parentWindow()
{
return dynamic_cast<TQWidget*>(application()->activeMainWindow());
}
@@ -523,7 +523,7 @@ TQWidget *KateFileTemplates::tqparentWindow()
// and edit the file as she wants to...
void KateFileTemplates::slotCreateTemplate()
{
- KateTemplateWizard w( tqparentWindow(), this );
+ KateTemplateWizard w( parentWindow(), this );
w.exec();
updateTemplateDirs();
@@ -536,7 +536,7 @@ void KateFileTemplates::slotCreateTemplate()
// * Set the URL to a writable one if required
void KateFileTemplates::slotEditTemplate()
{
- KDialogBase dlg( tqparentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close);
+ KDialogBase dlg( parentWindow(), "templatemanager", false, i18n("Manage File Templates"), KDialogBase::Close);
dlg.setMainWidget( new KateTemplateManager( this, &dlg ) );
dlg.exec();
}
diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h
index 6bcffce..e6fef30 100644
--- a/kate/filetemplates/plugin/filetemplates.h
+++ b/kate/filetemplates/plugin/filetemplates.h
@@ -102,7 +102,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface
/**
* @return a a pointer to the active main window
*/
- TQWidget * tqparentWindow();
+ TQWidget * parentWindow();
public slots:
/**
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index cc88a5b..2b8e80e 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -367,8 +367,8 @@ WaitDlg::~WaitDlg()
//BEGIN InsertCommandConfigPage
// This is the config page for this plugin.
InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*tqparent*/,
- TQWidget *tqparentWidget)
- : Kate::PluginConfigPage( tqparentWidget )
+ TQWidget *parentWidget)
+ : Kate::PluginConfigPage( parentWidget )
{
TQVBoxLayout* lo = new TQVBoxLayout( this );
lo->setSpacing(KDialogBase::spacingHint());
diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h
index ff3a584..5765a9b 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.h
+++ b/kate/insertcommand/plugin_kateinsertcommand.h
@@ -146,7 +146,7 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage
friend class PluginKateInsertCommand;
public:
- InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+ InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
~InsertCommandConfigPage() {}
/** Reimplemented from Kate::PluginConfigPage
diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp
index 4ebac34..521024c 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.cpp
+++ b/kate/kjswrapper/plugin_katekjswrapper.cpp
@@ -371,8 +371,8 @@ void PluginKateKJSWrapper::applyConfig( KateKJSWrapperConfigPage *p )
}
KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent,
- TQWidget *tqparentWidget)
- : Kate::PluginConfigPage( tqparentWidget ),m_plugin(tqparent)
+ TQWidget *parentWidget)
+ : Kate::PluginConfigPage( parentWidget ),m_plugin(tqparent)
{
TQVBoxLayout *l=new TQVBoxLayout(this);
l->setAutoAdd(true);
diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h
index ee6a311..31300d9 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.h
+++ b/kate/kjswrapper/plugin_katekjswrapper.h
@@ -122,7 +122,7 @@ class KateKJSWrapperConfigPage : public Kate::PluginConfigPage
friend class PluginKateKJSWrapper;
public:
- KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+ KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *parentWidget = 0L);
~KateKJSWrapperConfigPage() {};
/** Reimplemented from Kate::PluginConfigPage
diff --git a/kate/kjswrapper/samples/katekjstest1.js b/kate/kjswrapper/samples/katekjstest1.js
index a8b061b..7e4e041 100644
--- a/kate/kjswrapper/samples/katekjstest1.js
+++ b/kate/kjswrapper/samples/katekjstest1.js
@@ -1,7 +1,7 @@
/****************************************************************
First configuration page
****************************************************************/
-function Page1 (tqparentWidget) {
+function Page1 (parentWidget) {
this.defaults=function() {
alert("Defaults has been called");
}
@@ -11,7 +11,7 @@ function Page1 (tqparentWidget) {
this.reset=function() {
alert("Reset defaults has been called");
}
- box=new QVBox(tqparentWidget);
+ box=new QVBox(parentWidget);
this.button1=new QPushButton(box);
this.button1.text="P1 Button 1";
this.button1.show();
@@ -27,8 +27,8 @@ Page1.fullName="Test1/Page1";
Second configuration page
****************************************************************/
-function Page2 (tqparentWidget) {
- box=new QVBox(tqparentWidget);
+function Page2 (parentWidget) {
+ box=new QVBox(parentWidget);
this.button1=new QPushButton(box);
this.button1.text="P2 Button 1";
this.button1.show();
@@ -44,8 +44,8 @@ Page2.fullName="Test1/Page2";
Third configuration page
****************************************************************/
-function Page3 (tqparentWidget) {
- box=new QVBox(tqparentWidget);
+function Page3 (parentWidget) {
+ box=new QVBox(parentWidget);
this.button1=new QPushButton(box);
this.button1.text="P3 Button 1";
this.button1.show();
@@ -62,11 +62,11 @@ Page3.fullName="Test1/Page3";
First toolview
****************************************************************/
-function MyToolView1 (mainwindow,tqparentwidget) {
- tqparentwidget.caption="This is my first JS Toolview";
- tqparentwidget.icon=StdIcons.BarIcon("yes");
+function MyToolView1 (mainwindow,parentwidget) {
+ parentwidget.caption="This is my first JS Toolview";
+ parentwidget.icon=StdIcons.BarIcon("yes");
- this.lv = new KListView( tqparentwidget );
+ this.lv = new KListView( parentwidget );
this.lv.addColumn('Pix');
this.lv.addColumn('One');
@@ -99,11 +99,11 @@ MyToolView1.name="myfirstjstoolview"
Second toolview
****************************************************************/
-function MyToolView2 (mainwindow,tqparentwidget) {
- tqparentwidget.caption="This is my second JS Toolview";
- tqparentwidget.icon=StdIcons.BarIcon("no");
+function MyToolView2 (mainwindow,parentwidget) {
+ parentwidget.caption="This is my second JS Toolview";
+ parentwidget.icon=StdIcons.BarIcon("no");
- this.lb=new QListBox(tqparentwidget);
+ this.lb=new QListBox(parentwidget);
this.mainwindow=mainwindow;
this.cleanup=function() {
alert("Cleanup MyToolView2");
@@ -121,11 +121,11 @@ MyToolView2.name="mysecondjstoolview"
function newWindowCallBack(mainwindow) {
alert("New Window has been created");
/*
- anotherToolView = function (mainwindow,tqparentwidget) {
- tqparentwidget.caption="This is my third JS Toolview";
- tqparentwidget.icon=StdIcons.BarIcon("kate");
+ anotherToolView = function (mainwindow,parentwidget) {
+ parentwidget.caption="This is my third JS Toolview";
+ parentwidget.icon=StdIcons.BarIcon("kate");
- this.lb=new QListBox(tqparentwidget);
+ this.lb=new QListBox(parentwidget);
this.mainwindow=mainwindow;
this.cleanup=function() {
alert("Cleanup MyToolView3");
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index 5d2c268..483a677 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -390,7 +390,7 @@ KPyBrowser::KPBToolTip::maybeTip (const TQPoint & p)
TQString str;
TQRect r;
- ((KPyBrowser *) tqparentWidget ())->tip (p, r, str);
+ ((KPyBrowser *) parentWidget ())->tip (p, r, str);
if (!str.isEmpty () && r.isValid ())
tip (r, str);
diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui
index b694158..37c2aab 100644
--- a/kate/snippets/CWidgetSnippetsBase.ui
+++ b/kate/snippets/CWidgetSnippetsBase.ui
@@ -210,5 +210,5 @@
<functions>
<function returnType="TQListViewItem *">insertItem( const TQString&amp; name, bool bRename )</function>
</functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index e789c20..ece507f 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -475,8 +475,8 @@ void KateTabBarExtension::slotViewChanged ()
// BEGIN KateTabBarExtensionConfigPage
KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage(
- TQObject* /*tqparent*/ /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
- : Kate::PluginConfigPage( tqparentWidget )
+ TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
+ : Kate::PluginConfigPage( parentWidget )
{
TQVBoxLayout* top = new TQVBoxLayout(this, 0,
KDialogBase::spacingHint());
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 1655e18..bcc759a 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -268,7 +268,7 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage
friend class KatePluginTabBarExtension;
public:
- KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+ KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
~KateTabBarExtensionConfigPage ();
/**
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 65130e9..06b7a1e 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -8326,7 +8326,7 @@
<attribute name="xreflabel" type="#IMPLIED" value="CDATA" default=""/>
<attribute name="status" type="#IMPLIED" value="CDATA" default=""/>
<attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/>
-<attribute name="tqparentbook" type="#IMPLIED" value="IDREF" default=""/>
+<attribute name="parentbook" type="#IMPLIED" value="IDREF" default=""/>
<attribute name="class" type="#IMPLIED" enumeration="yes" value="journalarticle productsheet whitepaper techreport specification faq" default=""/>
<attribute name="id" type="#IMPLIED" value="ID" default=""/>
<attribute name="role" type="#IMPLIED" value="CDATA" default=""/>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index fe5c9f4..b3eea59 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -282,9 +282,9 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ )
else if( leftCh == "<" )
{
kdDebug() << "*outside tag -> get elements" << endl;
- TQString tqparentElement = getParentElement( *kv, true );
- kdDebug() << "tqparent: " << tqparentElement << endl;
- allowed = m_docDtds[docNumber]->allowedElements(tqparentElement );
+ TQString parentElement = getParentElement( *kv, true );
+ kdDebug() << "tqparent: " << parentElement << endl;
+ allowed = m_docDtds[docNumber]->allowedElements(parentElement );
m_mode = elements;
}
// TODO: optionally close tqparent tag if not left=="/>"
@@ -555,11 +555,11 @@ void PluginKateXMLTools::slotInsertElement()
}
PseudoDTD *dtd = m_docDtds[kv->document()->documentNumber()];
- TQString tqparentElement = getParentElement( *kv, false );
+ TQString parentElement = getParentElement( *kv, false );
TQStringList allowed;
if( dtd )
- allowed = dtd->allowedElements(tqparentElement );
+ allowed = dtd->allowedElements(parentElement );
InsertElement *dialog = new InsertElement(
( TQWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" );
@@ -616,11 +616,11 @@ void PluginKateXMLTools::slotCloseElement()
kdDebug() << "Warning: no Kate::View" << endl;
return;
}
- TQString tqparentElement = getParentElement( *kv, false );
+ TQString parentElement = getParentElement( *kv, false );
- //kdDebug() << "tqparentElement: '" << tqparentElement << "'" << endl;
- TQString closeTag = "</" + tqparentElement + ">";
- if( ! tqparentElement.isEmpty() )
+ //kdDebug() << "parentElement: '" << parentElement << "'" << endl;
+ TQString closeTag = "</" + parentElement + ">";
+ if( ! parentElement.isEmpty() )
kv->insertText( closeTag );
}
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index b6cc9b0..e0376d4 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -196,7 +196,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress )
* a list of allowed elements, but it doesn't care about order or if only a certain
* number of occurences is allowed.
*/
-TQStringList PseudoDTD::allowedElements( TQString tqparentElement )
+TQStringList PseudoDTD::allowedElements( TQString parentElement )
{
if( m_sgmlSupport )
{
@@ -204,12 +204,12 @@ TQStringList PseudoDTD::allowedElements( TQString tqparentElement )
TQMap<TQString,TQStringList>::Iterator it;
for( it = m_elementsList.begin(); it != m_elementsList.end(); ++it )
{
- if( it.key().lower() == tqparentElement.lower() )
+ if( it.key().lower() == parentElement.lower() )
return it.data();
}
}
- else if( m_elementsList.tqcontains(tqparentElement) )
- return m_elementsList[tqparentElement];
+ else if( m_elementsList.tqcontains(parentElement) )
+ return m_elementsList[parentElement];
return TQStringList();
}
diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h
index f798bea..912ec4b 100644
--- a/kate/xmltools/pseudo_dtd.h
+++ b/kate/xmltools/pseudo_dtd.h
@@ -46,11 +46,11 @@ class PseudoDTD
void analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd );
- TQStringList allowedElements( TQString tqparentElement );
- TQStringList allowedAttributes( TQString tqparentElement );
+ TQStringList allowedElements( TQString parentElement );
+ TQStringList allowedAttributes( TQString parentElement );
TQStringList attributeValues( TQString element, TQString attribute );
TQStringList entities( TQString start );
- TQStringList requiredAttributes( const TQString &tqparentElement ) const;
+ TQStringList requiredAttributes( const TQString &parentElement ) const;
protected: