Properly import python_tqt module in scripts generated by pyuic

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 8 years ago
parent e790d08307
commit 1638609997

@ -291,7 +291,7 @@ WIDTH="100%"
><TD ><TD
><PRE ><PRE
CLASS="PROGRAMLISTING" CLASS="PROGRAMLISTING"
>from qt import * >from python_tqt.qt import *
# Import our custom widget. # Import our custom widget.
from foo import bar</PRE from foo import bar</PRE

@ -256,7 +256,7 @@ Here's the corresponding output from <Literal>pyuic</Literal>.
</Para> </Para>
<ProgramListing> <ProgramListing>
from qt import * from python_tqt.qt import *
# Import our custom widget. # Import our custom widget.
from foo import bar from foo import bar

@ -285,7 +285,7 @@ Here's the corresponding output from <Literal>pyuic</Literal>.
</Para> </Para>
<ProgramListing> <ProgramListing>
from qt import * from python_tqt.qt import *
# Import our custom widget. # Import our custom widget.
from foo import bar from foo import bar

@ -9,7 +9,7 @@
void ConnectDialog::init() void ConnectDialog::init()
{ {
from qtsql import TQSqlDatabase from python_tqt.qtsql import TQSqlDatabase
#qDebug("ConnectDialog init") #qDebug("ConnectDialog init")
self.comboDriver.clear() self.comboDriver.clear()
self.comboDriver.insertStringList(TQSqlDatabase.drivers()) self.comboDriver.insertStringList(TQSqlDatabase.drivers())

@ -1581,7 +1581,7 @@ int main( int argc, char * argv[] )
if (execCode) if (execCode)
out << "import sys" << endl; out << "import sys" << endl;
out << "from qt import *" << endl; out << "from python_tqt.qt import *" << endl;
Uic( out, doc, trmacro.isEmpty() ? TQString("self.tr") : trmacro ); Uic( out, doc, trmacro.isEmpty() ? TQString("self.tr") : trmacro );

@ -135,7 +135,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
out << "\n"; out << "\n";
out << "\n"; out << "\n";
out << "from qt import TQImage, TQMimeSourceFactory"; out << "from python_tqt.qt import TQImage, TQMimeSourceFactory";
#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
out << ", tqUncompress"; out << ", tqUncompress";
#endif #endif

@ -258,13 +258,13 @@ void Uic::createFormImpl( const TQDomElement &e )
} }
if (globalIncludes.findIndex("qtable.h") >= 0) if (globalIncludes.findIndex("qtable.h") >= 0)
out << indent << "from qttable import TQTable" << endl; out << indent << "from python_tqt.qttable import TQTable" << endl;
if (!axwidgets.empty()) if (!axwidgets.empty())
out << indent << "from qtaxcontainer import TQAxWidget" << endl; out << indent << "from python_tqt.qtaxcontainer import TQAxWidget" << endl;
if (globalIncludes.findIndex("qextscintilla.h") >= 0) if (globalIncludes.findIndex("qextscintilla.h") >= 0)
out << indent << "from qtext import QextScintilla" << endl; out << indent << "from python_tqt.qtext import QextScintilla" << endl;
registerDatabases( e ); registerDatabases( e );
dbConnections = unique( dbConnections ); dbConnections = unique( dbConnections );
@ -302,7 +302,7 @@ void Uic::createFormImpl( const TQDomElement &e )
sqlClasses += "TQDataView"; sqlClasses += "TQDataView";
if ( !sqlClasses.empty() ) { if ( !sqlClasses.empty() ) {
out << indent << "from qtsql import"; out << indent << "from python_tqt.qtsql import";
const char *sep = " "; const char *sep = " ";
for ( it = sqlClasses.begin(); it != sqlClasses.end(); ++it ) { for ( it = sqlClasses.begin(); it != sqlClasses.end(); ++it ) {

@ -220,7 +220,7 @@ int main( int argc, char * argv[] )
if (testCode || execCode) if (testCode || execCode)
out << "import sys" << endl; out << "import sys" << endl;
out << "from qt import *" << endl; out << "from python_tqt.qt import *" << endl;
Uic( fileName, outputFile, out, doc, subcl, trmacro, className, uicClass ); Uic( fileName, outputFile, out, doc, subcl, trmacro, className, uicClass );

@ -36,7 +36,7 @@
// qt module which sorts it out, but this module doesn't so we add a dummy. It // qt module which sorts it out, but this module doesn't so we add a dummy. It
// is ignored by SIP v4.x and later. // is ignored by SIP v4.x and later.
%PrePythonCode %PrePythonCode
from qt import TQObject from python_tqt.qt import TQObject
%End %End

Loading…
Cancel
Save