Use the full names of PyTQt modules in the pytde_imports table.

This will allow PyTQt modules to be loaded automatically
when importing PyTDE modules.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/6/head
Slávek Banko 2 years ago
parent 25a48864e7
commit 065f41b490
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -100,30 +100,30 @@ pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources
"tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"] "tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"]
pytde_imports = { pytde_imports = {
"dcop": ["qt"], "dcop": ["PyTQt.qt"],
"tdecore": ["qt", "dcop"], "tdecore": ["PyTQt.qt", "dcop"],
# "tdesu": ["qt", "dcop", "tdecore"], # "tdesu": ["PyTQt.qt", "dcop", "tdecore"],
"tdefx": ["qt", "dcop", "tdecore"], "tdefx": ["PyTQt.qt", "dcop", "tdecore"],
"tdeui": ["qt", "qtxml", "dcop", "tdecore", "tdefx"], "tdeui": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx"],
"tdeio": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"], "tdeio": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
"tderesources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], "tderesources": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
"tdeabc": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"], "tdeabc": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"],
"tdeutils": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], "tdeutils": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
"tdefile": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], "tdefile": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
"tdeparts": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"], "tdeparts": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
"tdehtml": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"], "tdehtml": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"],
"tdespell": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"], "tdespell": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"],
"tdeprint": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"], "tdeprint": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
"tdemdi": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"], "tdemdi": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"],
"tdespell2": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"] "tdespell2": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"]
} }
kde_includes = { kde_includes = {
"dcop": None, "dcop": None,
"tdecore": None, "tdecore": None,
# "tdesu": ["tdesu"], # "tdesu": ["tdesu"],
"tdefx": None, "tdefx": None,
"tdeui": None, "tdeui": None,
"tdeio": ["tdeio"], "tdeio": ["tdeio"],
"tderesources": ["tdeio", "../tdeio", "tderesources"], "tderesources": ["tdeio", "../tdeio", "tderesources"],
"tdeabc": ["tdeio", "../tdeio", "tderesources", "tdeabc"], "tdeabc": ["tdeio", "../tdeio", "tderesources", "tdeabc"],
@ -131,20 +131,20 @@ kde_includes = {
"tdeparts": ["tdeio", "../tdeio", "tdeparts"], "tdeparts": ["tdeio", "../tdeio", "tdeparts"],
"tdehtml": ["tdeio", "../tdeio", "tdeparts", "dom"], "tdehtml": ["tdeio", "../tdeio", "tdeparts", "dom"],
"tdespell": ["tdeio"], "tdespell": ["tdeio"],
"tdeprint": ["tdeprint"], "tdeprint": ["tdeprint"],
"tdemdi": ["tdemdi", "tdeio", "../tdeio", "tdeparts"], "tdemdi": ["tdemdi", "tdeio", "../tdeio", "tdeparts"],
"tdeutils": ["tdeio", "../tdeio"] #, "tdeutils": ["tdeio", "../tdeio"] #,
# "tdespell2": None # "tdespell2": None
} }
postProcess = { postProcess = {
"dcop": None, "dcop": None,
"tdecore": [["-p ", "tdecore", "-o", "appQuit", "tdecore.py"], "tdecore": [["-p ", "tdecore", "-o", "appQuit", "tdecore.py"],
#["-p ", "tdecore", "-o", "fixTQVariant", "tdecore.sbf"], #["-p ", "tdecore", "-o", "fixTQVariant", "tdecore.sbf"],
["-p ", "tdecore", "-o", "fixSignal", "tdecorepart0.*"]], ["-p ", "tdecore", "-o", "fixSignal", "tdecorepart0.*"]],
# "tdesu": None, # "tdesu": None,
"tdefx": None, "tdefx": None,
"tdeui": None, #[["-p ", "tdeui", "-o", "shpix", "siptdeuiTDESharedPixmap.cpp"]], "tdeui": None, #[["-p ", "tdeui", "-o", "shpix", "siptdeuiTDESharedPixmap.cpp"]],
"tderesources": None, "tderesources": None,
"tdeabc": None, "tdeabc": None,
"tdeio": None, "tdeio": None,
@ -152,7 +152,7 @@ postProcess = {
"tdeparts": None, "tdeparts": None,
"tdehtml": None, "tdehtml": None,
"tdespell": None, "tdespell": None,
"tdeprint": None, "tdeprint": None,
"tdemdi": None, "tdemdi": None,
"tdeutils": None #, "tdeutils": None #,
# "tdespell2": None # "tdespell2": None
@ -624,7 +624,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
pyqtInclPathSeen = 0 pyqtInclPathSeen = 0
for mod in pytde_imports [mname]: for mod in pytde_imports [mname]:
if string.find (mod, "q") == 0 and not pyqtInclPathSeen: if string.find (mod, "PyTQt.q") == 0 and not pyqtInclPathSeen:
argv.append ("-I") argv.append ("-I")
argv.append (pyqtcfg.pyqt_sip_dir) argv.append (pyqtcfg.pyqt_sip_dir)
pyqtInclPathSeen = 1 pyqtInclPathSeen = 1

Loading…
Cancel
Save