From 7d27356bafd5670adcc8753ab5437b3bf8ffa4be Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Nov 2011 03:12:38 -0600
Subject: Initial TQt conversion

---
 siputils.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'siputils.py')

diff --git a/siputils.py b/siputils.py
index bb5959e..2df75af 100644
--- a/siputils.py
+++ b/siputils.py
@@ -927,7 +927,7 @@ class Makefile:
                 error("\"%s\" is missing from \"%s\"." % (i, bfname))
 
         # Get the optional values.
-        for i in ("headers", "moc_headers"):
+        for i in ("headers", "tqmoc_headers"):
             try:
                 bdict[i]
             except KeyError:
@@ -945,12 +945,12 @@ class Makefile:
             root, discard = os.path.splitext(f)
             olist.append(root + ext)
 
-        for f in bdict["moc_headers"].split():
+        for f in bdict["tqmoc_headers"].split():
             if not self._qt:
-                error("\"%s\" defines \"moc_headers\" for a non-Qt module." % bfname)
+                error("\"%s\" defines \"tqmoc_headers\" for a non-Qt module." % bfname)
 
             root, discard = os.path.splitext(f)
-            olist.append("moc_" + root + ext)
+            olist.append("tqmoc_" + root + ext)
 
         bdict["objects"] = ' '.join(olist)
 
@@ -967,9 +967,9 @@ class Makefile:
         for f in build["objects"].split():
             mfile.write("\t-%s %s\n" % (self.rm, f))
 
-        for f in build["moc_headers"].split():
+        for f in build["tqmoc_headers"].split():
             root, discard = os.path.splitext(f)
-            mfile.write("\t-%s moc_%s.cpp\n" % (self.rm, root))
+            mfile.write("\t-%s tqmoc_%s.cpp\n" % (self.rm, root))
 
     def ready(self):
         """The Makefile is now ready to be used.
@@ -1056,7 +1056,7 @@ class Makefile:
         mfile.write("LIBS = %s\n" % ' '.join(libs))
 
         if self._qt:
-            mfile.write("MOC = %s\n" % _quote(self.required_string("MOC")))
+            mfile.write("TQMOC = %s\n" % _quote(self.required_string("TQMOC")))
 
         if self._src_dir != self.dir:
             mfile.write("VPATH = %s\n\n" % self._src_dir)
@@ -1507,7 +1507,7 @@ class ModuleMakefile(Makefile):
 
         mfile.write("TARGET = %s\n" % (self._target + "." + ext))
         mfile.write("OFILES = %s\n" % self._build["objects"])
-        mfile.write("HFILES = %s %s\n" % (self._build["headers"], self._build["moc_headers"]))
+        mfile.write("HFILES = %s %s\n" % (self._build["headers"], self._build["tqmoc_headers"]))
         mfile.write("\n")
 
         if self.static:
@@ -1536,12 +1536,12 @@ class ModuleMakefile(Makefile):
         mfile.write("\nall: $(TARGET)\n")
         mfile.write("\n$(OFILES): $(HFILES)\n")
 
-        for mf in self._build["moc_headers"].split():
+        for mf in self._build["tqmoc_headers"].split():
             root, discard = os.path.splitext(mf)
-            cpp = "moc_" + root + ".cpp"
+            cpp = "tqmoc_" + root + ".cpp"
 
             mfile.write("\n%s: %s\n" % (cpp, mf))
-            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
+            mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf))
 
         mfile.write("\n$(TARGET): $(OFILES)\n")
 
@@ -1825,15 +1825,15 @@ class ProgramMakefile(Makefile):
         mfile.write("\nall: $(TARGET)\n")
         mfile.write("\n$(OFILES): $(HFILES)\n")
 
-        for mf in self._build["moc_headers"].split():
+        for mf in self._build["tqmoc_headers"].split():
             root, _ = os.path.splitext(mf)
-            cpp = "moc_" + root + ".cpp"
+            cpp = "tqmoc_" + root + ".cpp"
 
             if self._src_dir != self.dir:
                 mf = os.path.join(self._src_dir, mf)
 
             mfile.write("\n%s: %s\n" % (cpp, mf))
-            mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf))
+            mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf))
 
         mfile.write("\n$(TARGET): $(OFILES)\n")
 
-- 
cgit v1.2.1