summaryrefslogtreecommitdiffstats
path: root/lib/kross
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kross')
-rw-r--r--lib/kross/main/wdgscriptsmanagerbase.ui2
-rw-r--r--lib/kross/python/cxx/Objects.hxx14
-rw-r--r--lib/kross/python/cxx/PyCXX.html6
-rw-r--r--lib/kross/python/cxx/cxxsupport.cxx2
-rw-r--r--lib/kross/python/pythonextension.cpp2
-rw-r--r--lib/kross/python/scripts/RestrictedPython/Guards.py2
-rwxr-xr-xlib/kross/python/scripts/gui.py8
-rw-r--r--lib/kross/test/testcase.py4
-rw-r--r--lib/kross/test/testgui.py18
9 files changed, 29 insertions, 29 deletions
diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui
index d04223a4..1140e848 100644
--- a/lib/kross/main/wdgscriptsmanagerbase.ui
+++ b/lib/kross/main/wdgscriptsmanagerbase.ui
@@ -56,7 +56,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.hxx
index 3aa790e6..41648320 100644
--- a/lib/kross/python/cxx/Objects.hxx
+++ b/lib/kross/python/cxx/Objects.hxx
@@ -1470,8 +1470,8 @@ namespace Py
// Python strings return strings as individual elements.
// I'll try having a class Char which is a String of length 1
//
- typedef std::basic_string<Py_UNICODE> tqunicodestring;
- extern Py_UNICODE tqunicode_null_string[1];
+ typedef std::basic_string<Py_UNICODE> unicodestring;
+ extern Py_UNICODE unicode_null_string[1];
class Char: public Object
{
@@ -1535,7 +1535,7 @@ namespace Py
return *this;
}
- Char& operator= (const tqunicodestring& v)
+ Char& operator= (const unicodestring& v)
{
set(PyUnicode_FromUnicode (const_cast<Py_UNICODE*>(v.data()),1), true);
return *this;
@@ -1650,7 +1650,7 @@ namespace Py
static_cast<int>( v.length() ) ), true );
return *this;
}
- String& operator= (const tqunicodestring& v)
+ String& operator= (const unicodestring& v)
{
set( PyUnicode_FromUnicode( const_cast<Py_UNICODE*>( v.data() ),
static_cast<int>( v.length() ) ), true );
@@ -1706,16 +1706,16 @@ namespace Py
}
}
- tqunicodestring as_tqunicodestring() const
+ unicodestring as_unicodestring() const
{
if( isUnicode() )
{
- return tqunicodestring( PyUnicode_AS_UNICODE( ptr() ),
+ return unicodestring( PyUnicode_AS_UNICODE( ptr() ),
static_cast<size_type>( PyUnicode_GET_SIZE( ptr() ) ) );
}
else
{
- throw TypeError("can only return tqunicodestring from Unicode object");
+ throw TypeError("can only return unicodestring from Unicode object");
}
}
};
diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html
index e162e601..46d065bb 100644
--- a/lib/kross/python/cxx/PyCXX.html
+++ b/lib/kross/python/cxx/PyCXX.html
@@ -62,7 +62,7 @@ integrates Python with C++ in these ways: </p>
<p>Download PyCXX from <a href="http://sourceforge.net/projects/cxx/">http://sourceforge.net/projects/cxx/</a>.</p>
-<p>The distribution tqlayout is:</p>
+<p>The distribution layout is:</p>
<table>
<tr><th>Directory</th><th>Description</th></tr>
<tr><td class=code>.</td><td>Makefile for Unix and Windows, Release documentation</td>
@@ -1188,8 +1188,8 @@ sequence.</p>
<td class=code>as_std_string() const</td>
</tr>
<tr>
- <td class=code>tqunicodestring</td>
- <td class=code>as_tqunicodestring() const</td>
+ <td class=code>unicodestring</td>
+ <td class=code>as_unicodestring() const</td>
</tr>
</table>
diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cxx
index b7bcaa0a..61329b60 100644
--- a/lib/kross/python/cxx/cxxsupport.cxx
+++ b/lib/kross/python/cxx/cxxsupport.cxx
@@ -6,7 +6,7 @@
#include "Objects.hxx"
namespace Py {
-Py_UNICODE tqunicode_null_string[1] = { 0 };
+Py_UNICODE unicode_null_string[1] = { 0 };
Type Object::type () const
{
diff --git a/lib/kross/python/pythonextension.cpp b/lib/kross/python/pythonextension.cpp
index 9d8c3ece..dbbe9bf6 100644
--- a/lib/kross/python/pythonextension.cpp
+++ b/lib/kross/python/pythonextension.cpp
@@ -206,7 +206,7 @@ Kross::Api::Object::Ptr PythonExtension::toObject(const Py::Object& object)
#ifdef Py_USING_UNICODE
/* TODO
if(type == &PyUnicode_Type) {
- Py::tqunicodestring u = Py::String(object).as_tqunicodestring();
+ Py::unicodestring u = Py::String(object).as_unicodestring();
std::string s;
std::copy(u.begin(), u.end(), std::back_inserter(s));
return new Kross::Api::Variant(s.c_str());
diff --git a/lib/kross/python/scripts/RestrictedPython/Guards.py b/lib/kross/python/scripts/RestrictedPython/Guards.py
index 295ba791..4fbdcad1 100644
--- a/lib/kross/python/scripts/RestrictedPython/Guards.py
+++ b/lib/kross/python/scripts/RestrictedPython/Guards.py
@@ -24,7 +24,7 @@ for name in ['False', 'None', 'True', 'abs', 'basestring', 'bool', 'callable',
'chr', 'cmp', 'complex', 'divmod', 'float', 'hash',
'hex', 'id', 'int', 'isinstance', 'issubclass', 'len',
'long', 'oct', 'ord', 'pow', 'range', 'repr', 'round',
- 'str', 'tuple', 'unichr', 'tqunicode', 'xrange', 'zip']:
+ 'str', 'tuple', 'unichr', 'unicode', 'xrange', 'zip']:
safe_builtins[name] = __builtins__[name]
diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py
index 7461447a..9b8e0f8c 100755
--- a/lib/kross/python/scripts/gui.py
+++ b/lib/kross/python/scripts/gui.py
@@ -190,9 +190,9 @@ class QtDialog:
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)
+ self.layout = qt.QVBoxLayout(self)
+ self.layout.setSpacing(6)
+ self.layout.setMargin(11)
class Label(qt.QLabel):
def __init__(self, dialog, parent, caption):
@@ -323,7 +323,7 @@ class QtDialog:
self.widget = qt.QVBox(self.dialog)
self.widget.setSpacing(6)
- self.dialog.tqlayout.addWidget(self.widget)
+ self.dialog.layout.addWidget(self.widget)
self.Frame = Frame
self.Label = Label
diff --git a/lib/kross/test/testcase.py b/lib/kross/test/testcase.py
index 9fa58bc2..f1540201 100644
--- a/lib/kross/test/testcase.py
+++ b/lib/kross/test/testcase.py
@@ -79,8 +79,8 @@ class TestPlugin(unittest.TestCase):
self.assert_( self.pluginobject1.stringfunc(" Another \n\r Test! $%&\"") == " Another \n\r Test! $%&\"" )
#TODO
- #self.assert_( self.pluginobject1.stringfunc( tqunicode(" Unicode test ") ) == " Unicode test " )
- #self.assert_( self.pluginobject1.stringfunc(tqunicode(" Another Test! ")) == tqunicode(" Another Test! ") )
+ #self.assert_( self.pluginobject1.stringfunc( unicode(" Unicode test ") ) == " Unicode test " )
+ #self.assert_( self.pluginobject1.stringfunc(unicode(" Another Test! ")) == unicode(" Another Test! ") )
self.assert_( self.pluginobject1.stringstringfunc("MyString1", "MyString2") == "MyString1" )
self.assert_( self.pluginobject1.uintdoublestringfunc(8529,285.246,"String") == 8529 )
diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py
index 6a629c66..22b6f04b 100644
--- a/lib/kross/test/testgui.py
+++ b/lib/kross/test/testgui.py
@@ -89,27 +89,27 @@ class QtTest:
qt.QDialog.__init__(self, parent, name, modal, fl)
qt.QDialog.accept = self.accept
self.setCaption("Export to HTML")
- #self.tqlayout()
+ #self.layout()
- self.tqlayout = qt.QVBoxLayout(self)
- self.tqlayout.setSpacing(6)
- self.tqlayout.setMargin(11)
+ self.layout = qt.QVBoxLayout(self)
+ self.layout.setSpacing(6)
+ self.layout.setMargin(11)
infolabel = qt.QLabel("Export the data of a table or a query to a HTML-file.", self)
- self.tqlayout.addWidget(infolabel)
+ self.layout.addWidget(infolabel)
source = ComboBox(self, "Datasource:")
- self.tqlayout.addWidget(source)
+ self.layout.addWidget(source)
self.exporttype = ComboBox(self, "Style:", ["Plain","Paper","Desert","Blues"])
- self.tqlayout.addWidget(self.exporttype)
+ self.layout.addWidget(self.exporttype)
self.filechooser = FileChooser(self)
- self.tqlayout.addWidget(self.filechooser)
+ self.layout.addWidget(self.filechooser)
buttonbox = qt.QHBox(self)
buttonbox.setSpacing(6)
- self.tqlayout.addWidget(buttonbox)
+ self.layout.addWidget(buttonbox)
savebutton = Button("Save", buttonbox)
qt.QObject.connect(savebutton, qt.SIGNAL("clicked()"), self, qt.SLOT("accept()"))
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 23:27:08 +0000