summaryrefslogtreecommitdiffstats
path: root/lib/kross
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kross')
-rw-r--r--lib/kross/api/eventslot.h2
-rw-r--r--lib/kross/api/interpreter.h2
-rw-r--r--lib/kross/main/scriptguiclient.cpp16
-rw-r--r--lib/kross/main/scriptguiclient.h4
-rw-r--r--lib/kross/main/wdgscriptsmanager.cpp8
-rw-r--r--lib/kross/main/wdgscriptsmanager.h2
-rw-r--r--lib/kross/python/pythonscript.cpp2
-rwxr-xr-xlib/kross/python/scripts/gui.py94
-rw-r--r--lib/kross/test/testgui.py8
-rw-r--r--lib/kross/test/testobject.cpp4
-rw-r--r--lib/kross/test/testobject.h2
11 files changed, 72 insertions, 72 deletions
diff --git a/lib/kross/api/eventslot.h b/lib/kross/api/eventslot.h
index f9736fd0..aaf1ebba 100644
--- a/lib/kross/api/eventslot.h
+++ b/lib/kross/api/eventslot.h
@@ -47,7 +47,7 @@ namespace Kross { namespace Api {
*
* \param name The name of the EventSlot. The EventSlot
* will be accessible by that unique name via
- * it's tqparent.
+ * it's parent.
* \param receiver The receiver of the event.
* \param slot The slot of the receiver which this
* EventSlot points to.
diff --git a/lib/kross/api/interpreter.h b/lib/kross/api/interpreter.h
index 443585e3..ebb1a09b 100644
--- a/lib/kross/api/interpreter.h
+++ b/lib/kross/api/interpreter.h
@@ -94,7 +94,7 @@ namespace Kross { namespace Api {
/**
* \return the file-wildcard used to determinate by this interpreter
* used scriptingfiles. Those filter will be used e.g. with
- * KGlobal::dirs()->findAllResources() as filtertqmask. For example
+ * KGlobal::dirs()->findAllResources() as filtermask. For example
* python just defines it as "*py".
*/
const TQString getWildcard();
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index ebcf0b00..b3b29bda 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -44,15 +44,15 @@ namespace Kross { namespace Api {
{
public:
/**
- * The \a KXMLGUIClient that is tqparent of the \a ScriptGUIClient
+ * The \a KXMLGUIClient that is parent of the \a ScriptGUIClient
* instance.
*/
KXMLGUIClient* guiclient;
/**
- * The optional tqparent TQWidget widget.
+ * The optional parent TQWidget widget.
*/
- TQWidget* tqparent;
+ TQWidget* parent;
/**
* Map of \a ScriptActionCollection instances the \a ScriptGUIClient
@@ -63,15 +63,15 @@ namespace Kross { namespace Api {
}}
-ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* tqparent)
- : TQObject( tqparent )
+ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent)
+ : TQObject( parent )
, KXMLGUIClient( guiclient )
, d( new ScriptGUIClientPrivate() ) // initialize d-pointer class
{
krossdebug( TQString("ScriptGUIClient::ScriptGUIClient() Ctor") );
d->guiclient = guiclient;
- d->tqparent = tqparent;
+ d->parent = parent;
setInstance( ScriptGUIClient::instance() );
@@ -311,7 +311,7 @@ KURL ScriptGUIClient::openScriptFile(const TQString& caption)
KFileDialog* filedialog = new KFileDialog(
TQString(), // startdir
mimetypes.join(" "), // filter
- 0, // tqparent widget
+ 0, // parent widget
"ScriptGUIClientFileDialog", // name
true // modal
);
@@ -374,7 +374,7 @@ bool ScriptGUIClient::executeScriptAction(ScriptAction::Ptr action)
void ScriptGUIClient::showScriptManager()
{
- KDialogBase* dialog = new KDialogBase(d->tqparent, "", true, i18n("Scripts Manager"), KDialogBase::Close);
+ KDialogBase* dialog = new KDialogBase(d->parent, "", true, i18n("Scripts Manager"), KDialogBase::Close);
WdgScriptsManager* wsm = new WdgScriptsManager(this, dialog);
dialog->setMainWidget(wsm);
dialog->resize( TQSize(360, 320).expandedTo(dialog->tqminimumSizeHint()) );
diff --git a/lib/kross/main/scriptguiclient.h b/lib/kross/main/scriptguiclient.h
index af762720..a835d0a2 100644
--- a/lib/kross/main/scriptguiclient.h
+++ b/lib/kross/main/scriptguiclient.h
@@ -58,12 +58,12 @@ namespace Kross { namespace Api {
*
* \param guiclient The KXMLGUIClient this \a ScriptGUIClient
* is a child of.
- * \param tqparent The tqparent TQWidget. If defined TQt will handle
+ * \param parent The parent TQWidget. If defined TQt will handle
* freeing this \a ScriptGUIClient instance else the
* caller has to take care of freeing this instance
* if not needed any longer.
*/
- explicit ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* tqparent = 0);
+ explicit ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent = 0);
/**
* Destructor.
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 781f344b..d3ab6277 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -87,7 +87,7 @@ class ListItem : public TQListViewItem
class ToolTip : public TQToolTip
{
public:
- ToolTip(KListView* tqparent) : TQToolTip(tqparent->viewport()), m_parent(tqparent) {}
+ ToolTip(KListView* parent) : TQToolTip(parent->viewport()), m_parent(parent) {}
virtual ~ToolTip () { remove(m_parent->viewport()); }
protected:
virtual void maybeTip(const TQPoint& p) {
@@ -114,8 +114,8 @@ class WdgScriptsManagerPrivate
//enum { LoadBtn = 0, UnloadBtn, InstallBtn, UninstallBtn, ExecBtn, NewStuffBtn };
};
-WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* tqparent, const char* name, WFlags fl )
- : WdgScriptsManagerBase(tqparent, name, fl)
+WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, const char* name, WFlags fl )
+ : WdgScriptsManagerBase(parent, name, fl)
, d(new WdgScriptsManagerPrivate)
{
d->m_scripguiclient = scr;
@@ -254,7 +254,7 @@ void WdgScriptsManager::slotInstallScript()
KFileDialog* filedialog = new KFileDialog(
TQString(), // startdir
"*.tar.gz *.tgz *.bz2", // filter
- this, // tqparent widget
+ this, // parent widget
"WdgScriptsManagerInstallFileDialog", // name
true // modal
);
diff --git a/lib/kross/main/wdgscriptsmanager.h b/lib/kross/main/wdgscriptsmanager.h
index 34976373..596017ce 100644
--- a/lib/kross/main/wdgscriptsmanager.h
+++ b/lib/kross/main/wdgscriptsmanager.h
@@ -37,7 +37,7 @@ class WdgScriptsManager : public WdgScriptsManagerBase
Q_OBJECT
TQ_OBJECT
public:
- WdgScriptsManager(ScriptGUIClient* scr, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0);
+ WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0);
~WdgScriptsManager();
public slots:
void slotLoadScript();
diff --git a/lib/kross/python/pythonscript.cpp b/lib/kross/python/pythonscript.cpp
index 7d34a6fb..2329a1d1 100644
--- a/lib/kross/python/pythonscript.cpp
+++ b/lib/kross/python/pythonscript.cpp
@@ -108,7 +108,7 @@ void PythonScript::initialize()
// python scripting code.
Py::Dict moduledict = d->m_module->getDict();
moduledict["self"] = PythonExtension::toPyObject( m_scriptcontainer );
- //moduledict["tqparent"] = PythonExtension::toPyObject( m_manager );
+ //moduledict["parent"] = PythonExtension::toPyObject( m_manager );
/*
// Prepare the local context.
diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py
index 997e9849..9dc8a799 100755
--- a/lib/kross/python/scripts/gui.py
+++ b/lib/kross/python/scripts/gui.py
@@ -43,43 +43,43 @@ class TkDialog:
self.widget = mainframe.widget
class Widget:
- def __init__(self, dialog, tqparent):
+ def __init__(self, dialog, parent):
self.dialog = dialog
- self.tqparent = tqparent
+ self.parent = parent
#def setVisible(self, visibled): pass
#def setEnabled(self, enabled): pass
class Frame(Widget):
- def __init__(self, dialog, tqparent):
- #TkDialog.Widget.__init__(self, dialog, tqparent)
+ def __init__(self, dialog, parent):
+ #TkDialog.Widget.__init__(self, dialog, parent)
import Tkinter
- self.widget = Tkinter.Frame(tqparent)
+ self.widget = Tkinter.Frame(parent)
self.widget.pack()
class Label(Widget):
- def __init__(self, dialog, tqparent, caption):
- #TkDialog.Widget.__init__(self, dialog, tqparent)
+ def __init__(self, dialog, parent, caption):
+ #TkDialog.Widget.__init__(self, dialog, parent)
import Tkinter
- self.widget = Tkinter.Label(tqparent, text=caption)
+ self.widget = Tkinter.Label(parent, text=caption)
self.widget.pack(side=Tkinter.TOP)
class CheckBox(Widget):
- def __init__(self, dialog, tqparent, caption, checked = True):
- #TkDialog.Widget.__init__(self, dialog, tqparent)
+ def __init__(self, dialog, parent, caption, checked = True):
+ #TkDialog.Widget.__init__(self, dialog, parent)
import Tkinter
self.checkstate = Tkinter.IntVar()
self.checkstate.set(checked)
- self.widget = Tkinter.Checkbutton(tqparent, text=caption, variable=self.checkstate)
+ self.widget = Tkinter.Checkbutton(parent, text=caption, variable=self.checkstate)
self.widget.pack(side=Tkinter.TOP)
def isChecked(self):
return self.checkstate.get()
class List(Widget):
- def __init__(self, dialog, tqparent, caption, items):
- #TkDialog.Widget.__init__(self, dialog, tqparent)
+ def __init__(self, dialog, parent, caption, items):
+ #TkDialog.Widget.__init__(self, dialog, parent)
import Tkinter
- listframe = Tkinter.Frame(tqparent)
+ listframe = Tkinter.Frame(parent)
listframe.pack()
Tkinter.Label(listframe, text=caption).pack(side=Tkinter.LEFT)
@@ -94,10 +94,10 @@ class TkDialog:
self.variable.set( self.items[index] )
class Button(Widget):
- def __init__(self, dialog, tqparent, caption, commandmethod):
- #TkDialog.Widget.__init__(self, dialog, tqparent)
+ def __init__(self, dialog, parent, caption, commandmethod):
+ #TkDialog.Widget.__init__(self, dialog, parent)
import Tkinter
- self.widget = Tkinter.Button(tqparent, text=caption, command=self.doCommand)
+ self.widget = Tkinter.Button(parent, text=caption, command=self.doCommand)
self.commandmethod = commandmethod
self.widget.pack(side=Tkinter.LEFT)
def doCommand(self):
@@ -114,10 +114,10 @@ class TkDialog:
#self.dialog.root.destroy()
class Edit(Widget):
- def __init__(self, dialog, tqparent, caption, text):
- #TkDialog.Widget.__init__(self, dialog, tqparent)
+ def __init__(self, dialog, parent, caption, text):
+ #TkDialog.Widget.__init__(self, dialog, parent)
import Tkinter
- self.widget = Tkinter.Frame(tqparent)
+ self.widget = Tkinter.Frame(parent)
self.widget.pack()
label = Tkinter.Label(self.widget, text=caption)
label.pack(side=Tkinter.LEFT)
@@ -129,8 +129,8 @@ class TkDialog:
return self.entrytext.get()
class FileChooser(Edit):
- def __init__(self, dialog, tqparent, caption, initialfile = None, filetypes = None):
- TkDialog.Edit.__init__(self, dialog, tqparent, caption, initialfile)
+ def __init__(self, dialog, parent, caption, initialfile = None, filetypes = None):
+ TkDialog.Edit.__init__(self, dialog, parent, caption, initialfile)
import Tkinter
self.initialfile = initialfile
@@ -187,27 +187,27 @@ class QtDialog:
import qt
class Dialog(qt.QDialog):
- def __init__(self, tqparent = None, name = None, modal = 0, fl = 0):
- qt.QDialog.__init__(self, tqparent, name, modal, fl)
+ def __init__(self, parent = None, name = None, modal = 0, fl = 0):
+ qt.QDialog.__init__(self, parent, name, modal, fl)
qt.QDialog.accept = self.accept
self.tqlayout = qt.QVBoxLayout(self)
self.tqlayout.setSpacing(6)
self.tqlayout.setMargin(11)
class Label(qt.QLabel):
- def __init__(self, dialog, tqparent, caption):
- qt.QLabel.__init__(self, tqparent)
+ def __init__(self, dialog, parent, caption):
+ qt.QLabel.__init__(self, parent)
self.setText("<qt>%s</qt>" % caption.replace("\n","<br>"))
class Frame(qt.QHBox):
- def __init__(self, dialog, tqparent):
- qt.QHBox.__init__(self, tqparent)
+ def __init__(self, dialog, parent):
+ qt.QHBox.__init__(self, parent)
self.widget = self
self.setSpacing(6)
class Edit(qt.QHBox):
- def __init__(self, dialog, tqparent, caption, text):
- qt.QHBox.__init__(self, tqparent)
+ def __init__(self, dialog, parent, caption, text):
+ qt.QHBox.__init__(self, parent)
self.setSpacing(6)
label = qt.QLabel(caption, self)
self.edit = qt.QLineEdit(self)
@@ -219,26 +219,26 @@ class QtDialog:
class Button(qt.QPushButton):
#def __init__(self, *args):
- def __init__(self, dialog, tqparent, caption, commandmethod):
+ def __init__(self, dialog, parent, caption, commandmethod):
#apply(qt.QPushButton.__init__, (self,) + args)
- qt.QPushButton.__init__(self, tqparent)
+ qt.QPushButton.__init__(self, parent)
self.commandmethod = commandmethod
self.setText(caption)
qt.QObject.connect(self, qt.SIGNAL("clicked()"), self.commandmethod)
class CheckBox(qt.QCheckBox):
- def __init__(self, dialog, tqparent, caption, checked = True):
- #TkDialog.Widget.__init__(self, dialog, tqparent)
- qt.QCheckBox.__init__(self, tqparent)
+ def __init__(self, dialog, parent, caption, checked = True):
+ #TkDialog.Widget.__init__(self, dialog, parent)
+ qt.QCheckBox.__init__(self, parent)
self.setText(caption)
self.setChecked(checked)
#def isChecked(self):
# return self.isChecked()
class List(qt.QHBox):
- def __init__(self, dialog, tqparent, caption, items):
- qt.QHBox.__init__(self, tqparent)
+ def __init__(self, dialog, parent, caption, items):
+ qt.QHBox.__init__(self, parent)
self.setSpacing(6)
label = qt.QLabel(caption, self)
self.combo = qt.QComboBox(self)
@@ -252,9 +252,9 @@ class QtDialog:
self.combo.setCurrentItem(index)
class FileChooser(qt.QHBox):
- def __init__(self, dialog, tqparent, caption, initialfile = None, filetypes = None):
+ def __init__(self, dialog, parent, caption, initialfile = None, filetypes = None):
#apply(qt.QHBox.__init__, (self,) + args)
- qt.QHBox.__init__(self, tqparent)
+ qt.QHBox.__init__(self, parent)
self.setMinimumWidth(400)
self.initialfile = initialfile
@@ -274,29 +274,29 @@ class QtDialog:
return self.edit.text()
def browseButtonClicked(self):
- filtertqmask = ""
+ filtermask = ""
import types
if isinstance(self.filetypes, types.TupleType):
for ft in self.filetypes:
if len(ft) == 1:
- filtertqmask += "%s\n" % (ft[0])
+ filtermask += "%s\n" % (ft[0])
if len(ft) == 2:
- filtertqmask += "%s|%s (%s)\n" % (ft[1],ft[0],ft[1])
- if filtertqmask == "":
- filtertqmask = "All files (*.*)"
+ filtermask += "%s|%s (%s)\n" % (ft[1],ft[0],ft[1])
+ if filtermask == "":
+ filtermask = "All files (*.*)"
else:
- filtertqmask = filtertqmask[:-1]
+ filtermask = filtermask[:-1]
filename = None
try:
print "QtDialog.FileChooser.browseButtonClicked() kfile.KFileDialog"
# try to use the kfile module included in pykde
import kfile
- filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtertqmask, self, "Save to file")
+ filename = kfile.KFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file")
except:
print "QtDialog.FileChooser.browseButtonClicked() qt.QFileDialog"
# fallback to Qt filedialog
- filename = qt.QFileDialog.getOpenFileName(self.initialfile, filtertqmask, self, "Save to file")
+ filename = qt.QFileDialog.getOpenFileName(self.initialfile, filtermask, self, "Save to file")
if filename != None and filename != "":
self.edit.setText(filename)
diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py
index a7353873..98552044 100644
--- a/lib/kross/test/testgui.py
+++ b/lib/kross/test/testgui.py
@@ -44,8 +44,8 @@ class QtTest:
apply(qt.QPushButton.__init__, (self,) + args)
class ComboBox(qt.QHBox):
- def __init__(self, tqparent, caption, items = []):
- qt.QHBox.__init__(self, tqparent)
+ def __init__(self, parent, caption, items = []):
+ qt.QHBox.__init__(self, parent)
self.setSpacing(6)
label = qt.QLabel(str(caption), self)
self.combobox = qt.QComboBox(self)
@@ -85,8 +85,8 @@ class QtTest:
self.edit.setText(filename)
class Dialog(qt.QDialog):
- def __init__(self, tqparent = None, name = None, modal = 0, fl = 0):
- qt.QDialog.__init__(self, tqparent, name, modal, fl)
+ def __init__(self, parent = None, name = None, modal = 0, fl = 0):
+ qt.QDialog.__init__(self, parent, name, modal, fl)
qt.QDialog.accept = self.accept
self.setCaption("Export to HTML")
#self.tqlayout()
diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp
index 1c7e8e39..eb687d02 100644
--- a/lib/kross/test/testobject.cpp
+++ b/lib/kross/test/testobject.cpp
@@ -26,8 +26,8 @@ TestObject::TestObject()
{
}
-TestObject::TestObject(TQObject* tqparent, Kross::Api::ScriptContainer::Ptr scriptcontainer)
- : TQObject(tqparent, "TestObject")
+TestObject::TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer)
+ : TQObject(parent, "TestObject")
{
connect(this, TQT_SIGNAL(testSignal()), this, TQT_SLOT(testSignalSlot()));
connect(this, TQT_SIGNAL(stdoutSignal(const TQString&)), this, TQT_SLOT(stdoutSlot(const TQString&)));
diff --git a/lib/kross/test/testobject.h b/lib/kross/test/testobject.h
index 5a04d9dc..7bbf6f05 100644
--- a/lib/kross/test/testobject.h
+++ b/lib/kross/test/testobject.h
@@ -34,7 +34,7 @@ class TestObject : public TQObject
public:
TestObject();
- TestObject(TQObject* tqparent, Kross::Api::ScriptContainer::Ptr scriptcontainer);
+ TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer);
~TestObject();
uint func1(uint);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 12:18:54 +0000