summaryrefslogtreecommitdiffstats
path: root/src/tools/boost
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/boost')
-rw-r--r--src/tools/boost/boost.cpp22
-rw-r--r--src/tools/boost/boost.h16
-rw-r--r--src/tools/boost/boost_generator.cpp10
-rw-r--r--src/tools/boost/boostbasic.cpp6
-rw-r--r--src/tools/boost/boostbasic.h16
-rw-r--r--src/tools/boost/boostc.cpp6
-rw-r--r--src/tools/boost/boostc.h16
-rw-r--r--src/tools/boost/boostc_compile.cpp18
-rw-r--r--src/tools/boost/boostc_compile.h17
-rw-r--r--src/tools/boost/boostcpp.cpp6
-rw-r--r--src/tools/boost/boostcpp.h16
-rw-r--r--src/tools/boost/gui/boost_ui.h1
12 files changed, 77 insertions, 73 deletions
diff --git a/src/tools/boost/boost.cpp b/src/tools/boost/boost.cpp
index 86e304c..e67f833 100644
--- a/src/tools/boost/boost.cpp
+++ b/src/tools/boost/boost.cpp
@@ -15,7 +15,7 @@
#include "devices/base/device_group.h"
//----------------------------------------------------------------------------
-bool Boost::Linker::checkExecutableResult(bool, QStringList &lines) const
+bool Boost::Linker::checkExecutableResult(bool, TQStringList &lines) const
{
return ( lines.count()>0 && lines[0].startsWith("BoostLink ") );
}
@@ -25,26 +25,26 @@ PURL::Directory Boost::Linker::checkExecutableWorkingDirectory() const
return static_cast<const Group *>(_group)->checkExecutableUrl().directory();
}
-QStringList Boost::Linker16::checkExecutableOptions(bool) const
+TQStringList Boost::Linker16::checkExecutableOptions(bool) const
{
// #### otherwise may stall...
- QStringList args;
+ TQStringList args;
args += "-t PIC16F873";
args += static_cast<const Group *>(_group)->checkExecutableUrl().toExtension("obj").filename();
return args;
}
-QStringList Boost::Linker18::checkExecutableOptions(bool) const
+TQStringList Boost::Linker18::checkExecutableOptions(bool) const
{
// #### otherwise may stall...
- QStringList args;
+ TQStringList args;
args += "-t PIC18F452";
args += static_cast<const Group *>(_group)->checkExecutableUrl().toExtension("obj").filename();
return args;
}
//----------------------------------------------------------------------------
-QStringList Boost::Compiler::checkExecutableOptions(bool) const
+TQStringList Boost::Compiler::checkExecutableOptions(bool) const
{
// #### otherwise may stall...
return static_cast<const Group *>(_group)->checkExecutableUrl().filename();
@@ -56,14 +56,14 @@ PURL::Directory Boost::Compiler::checkExecutableWorkingDirectory() const
}
//----------------------------------------------------------------------------
-Boost::Group::Group(const QString &extension, const QString &text)
+Boost::Group::Group(const TQString &extension, const TQString &text)
: _checkExecTmp(_sview, extension)
{
if ( _checkExecTmp.openForWrite() ) _checkExecTmp.appendText(text);
_checkExecTmp.close();
}
-QString Boost::Group::comment() const
+TQString Boost::Group::comment() const
{
return i18n("The Boost toolchain needs to be run by Wine with \"Windows NT 4.0\" compatibility. This can be configured with the Wine configuration utility.");
}
@@ -90,10 +90,10 @@ Compile::Config *Boost::Group::configFactory(::Project *project) const
return new Boost::Config(project);
}
-QValueList<const Device::Data *> Boost::Group::getSupportedDevices(const QString &) const
+TQValueList<const Device::Data *> Boost::Group::getSupportedDevices(const TQString &) const
{
- QValueList<const Device::Data *> list;
- QValueVector<QString> devices = Device::lister().group("pic")->supportedDevices();
+ TQValueList<const Device::Data *> list;
+ TQValueVector<TQString> devices = Device::lister().group("pic")->supportedDevices();
for (uint i=0; i<devices.count(); i++) {
const Device::Data *data = Device::lister().data(devices[i]);
if ( supportedArchitecture(static_cast<const Pic::Data *>(data)->architecture()) ) list.append(data);
diff --git a/src/tools/boost/boost.h b/src/tools/boost/boost.h
index d6142c9..34d1414 100644
--- a/src/tools/boost/boost.h
+++ b/src/tools/boost/boost.h
@@ -19,28 +19,28 @@ namespace Boost
class Linker : public Tool::Base
{
private:
- virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostlink.pic.exe"; }
- virtual bool checkExecutableResult(bool withWine, QStringList &lines) const;
+ virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostlink.pic.exe"; }
+ virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const;
virtual PURL::Directory checkExecutableWorkingDirectory() const;
};
class Linker16 : public Linker
{
private:
- virtual QStringList checkExecutableOptions(bool withWine) const;
+ virtual TQStringList checkExecutableOptions(bool withWine) const;
};
class Linker18 : public Linker
{
private:
- virtual QStringList checkExecutableOptions(bool withWine) const;
+ virtual TQStringList checkExecutableOptions(bool withWine) const;
};
//----------------------------------------------------------------------------
class Compiler : public Tool::Base
{
private:
- virtual QStringList checkExecutableOptions(bool withWine) const;
+ virtual TQStringList checkExecutableOptions(bool withWine) const;
virtual PURL::Directory checkExecutableWorkingDirectory() const;
};
@@ -48,9 +48,9 @@ private:
class Group : public Tool::Group
{
public:
- Group(const QString &extension, const QString &text);
+ Group(const TQString &extension, const TQString &text);
PURL::Url checkExecutableUrl() const { return _checkExecTmp.url(); }
- virtual QString comment() const;
+ virtual TQString comment() const;
virtual Tool::Category checkDevicesCategory() const { return Tool::Category::Nb_Types; }
virtual Tool::ExecutableType preferedExecutableType() const { return Tool::ExecutableType::Windows; }
virtual Tool::CompileType compileType() const { return Tool::SeparateFiles; }
@@ -64,7 +64,7 @@ private:
Log::StringView _sview;
PURL::TempFile _checkExecTmp;
- virtual QValueList<const Device::Data *> getSupportedDevices(const QString &s) const;
+ virtual TQValueList<const Device::Data *> getSupportedDevices(const TQString &s) const;
virtual Compile::Process *processFactory(const Compile::Data &data) const;
virtual Compile::Config *configFactory(::Project *project) const;
};
diff --git a/src/tools/boost/boost_generator.cpp b/src/tools/boost/boost_generator.cpp
index 2fa1393..0d204ad 100644
--- a/src/tools/boost/boost_generator.cpp
+++ b/src/tools/boost/boost_generator.cpp
@@ -20,9 +20,9 @@ SourceLine::List Boost::CSourceGenerator::configLines(PURL::ToolType, const Devi
Address address = data.range(Pic::MemoryRangeType::Config).start;
for (uint i=0; i<data.nbWords(Pic::MemoryRangeType::Config); i++) {
const Pic::Config::Word &cword = config._words[i];
- QStringList cnames = SourceLine::configNames(Pic::ConfigNameType::Default, pmemory, i, ok);
+ TQStringList cnames = SourceLine::configNames(Pic::ConfigNameType::Default, pmemory, i, ok);
if ( cnames.isEmpty() ) continue;
- QString code = "#pragma DATA ";
+ TQString code = "#pragma DATA ";
if ( cword.name.isEmpty() ) code += toHexLabel(address, data.nbCharsAddress());
else code += "__" + cword.name;
code += cnames.join(" & ") + ";";
@@ -44,12 +44,12 @@ SourceLine::List Boost::CSourceGenerator::sourceFileContent(PURL::ToolType, cons
SourceLine::List lines;
lines.appendTitle(i18n("interrupt service routine"));
lines.appendNotIndentedCode("void interrupt(void) {");
- lines.appendIndentedCode(QString::null, "<< " + i18n("insert interrupt code") + " >>");
+ lines.appendIndentedCode(TQString(), "<< " + i18n("insert interrupt code") + " >>");
lines.appendNotIndentedCode("}");
lines.appendEmpty();
lines.appendTitle(i18n("main program"));
lines.appendNotIndentedCode("void main() {");
- lines.appendIndentedCode(QString::null, "<< " + i18n("insert code") + " >>");
+ lines.appendIndentedCode(TQString(), "<< " + i18n("insert code") + " >>");
lines.appendNotIndentedCode("}");
return lines;
}
@@ -73,7 +73,7 @@ SourceLine::List Boost::BasicSourceGenerator::sourceFileContent(PURL::ToolType,
ok = true;
lines.appendTitle(i18n("main program"));
lines.appendNotIndentedCode("Sub main()");
- lines.appendIndentedCode(QString::null, "<< " + i18n("insert code") + " >>");
+ lines.appendIndentedCode(TQString(), "<< " + i18n("insert code") + " >>");
lines.appendIndentedCode("Do while 1", i18n("loop forever"));
lines.appendIndentedCode("Loop");
lines.appendNotIndentedCode("End Sub");
diff --git a/src/tools/boost/boostbasic.cpp b/src/tools/boost/boostbasic.cpp
index 9983874..dc449f8 100644
--- a/src/tools/boost/boostbasic.cpp
+++ b/src/tools/boost/boostbasic.cpp
@@ -11,15 +11,15 @@
#include "boost_generator.h"
//----------------------------------------------------------------------------
-bool Boost::CompilerBasic::checkExecutableResult(bool, QStringList &lines) const
+bool Boost::CompilerBasic::checkExecutableResult(bool, TQStringList &lines) const
{
return ( lines.count()>0 && lines[0].startsWith("BoostBasic ") );
}
//----------------------------------------------------------------------------
-QString Boost::GroupBasic::informationText() const
+TQString Boost::GroupBasic::informationText() const
{
- return i18n("<a href=\"%1\">BoostBasic Compiler</a> is a Basic compiler distributed by SourceBoost Technologies.").arg("http://www.sourceboost.com/Products/BoostBasic/Overview.html");
+ return i18n("<a href=\"%1\">BoostBasic Compiler</a> is a Basic compiler distributed by SourceBoost Technologies.").tqarg("http://www.sourceboost.com/Products/BoostBasic/Overview.html");
}
Tool::SourceGenerator *Boost::GroupBasic::sourceGeneratorFactory() const
diff --git a/src/tools/boost/boostbasic.h b/src/tools/boost/boostbasic.h
index 5f3b820..26cd90c 100644
--- a/src/tools/boost/boostbasic.h
+++ b/src/tools/boost/boostbasic.h
@@ -17,19 +17,19 @@ namespace Boost
class CompilerBasic : public Compiler
{
private:
- virtual bool checkExecutableResult(bool withWine, QStringList &lines) const;
+ virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const;
};
class CompilerBasic16 : public CompilerBasic
{
public:
- virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostbasic.pic16.exe"; }
+ virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostbasic.pic16.exe"; }
};
class CompilerBasic18 : public CompilerBasic
{
public:
- virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostbasic.pic18.exe"; }
+ virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostbasic.pic18.exe"; }
};
//----------------------------------------------------------------------------
@@ -37,7 +37,7 @@ class GroupBasic : public Group
{
public:
GroupBasic() : Group(".bas", "Sub main()\nEnd Sub\n") {}
- virtual QString informationText() const;
+ virtual TQString informationText() const;
virtual PURL::FileType implementationType(PURL::ToolType type) const { return (type==PURL::ToolType::Compiler ? PURL::BasicSource : PURL::Nb_FileTypes); }
private:
@@ -47,8 +47,8 @@ private:
class GroupBasic16 : public GroupBasic
{
public:
- virtual QString name() const { return "boostbasic16"; }
- virtual QString label() const { return i18n("BoostBasic Compiler for PIC16"); }
+ virtual TQString name() const { return "boostbasic16"; }
+ virtual TQString label() const { return i18n("BoostBasic Compiler for PIC16"); }
private:
virtual BaseData baseFactory(Tool::Category) const;
@@ -58,8 +58,8 @@ private:
class GroupBasic18 : public GroupBasic
{
public:
- virtual QString name() const { return "boostbasic18"; }
- virtual QString label() const { return i18n("BoostBasic Compiler for PIC18"); }
+ virtual TQString name() const { return "boostbasic18"; }
+ virtual TQString label() const { return i18n("BoostBasic Compiler for PIC18"); }
private:
virtual BaseData baseFactory(Tool::Category) const;
diff --git a/src/tools/boost/boostc.cpp b/src/tools/boost/boostc.cpp
index 9a6ada9..74047a0 100644
--- a/src/tools/boost/boostc.cpp
+++ b/src/tools/boost/boostc.cpp
@@ -11,15 +11,15 @@
#include "boost_generator.h"
//----------------------------------------------------------------------------
-bool Boost::CompilerC::checkExecutableResult(bool, QStringList &lines) const
+bool Boost::CompilerC::checkExecutableResult(bool, TQStringList &lines) const
{
return ( lines.count()>0 && lines[0].startsWith("BoostC ") );
}
//----------------------------------------------------------------------------
-QString Boost::GroupC::informationText() const
+TQString Boost::GroupC::informationText() const
{
- return i18n("<a href=\"%1\">BoostC Compiler</a> is a C compiler distributed by SourceBoost Technologies.").arg("http://www.sourceboost.com/Products/BoostC/Overview.html");
+ return i18n("<a href=\"%1\">BoostC Compiler</a> is a C compiler distributed by SourceBoost Technologies.").tqarg("http://www.sourceboost.com/Products/BoostC/Overview.html");
}
Tool::SourceGenerator *Boost::GroupC::sourceGeneratorFactory() const
diff --git a/src/tools/boost/boostc.h b/src/tools/boost/boostc.h
index 5191560..1e30b12 100644
--- a/src/tools/boost/boostc.h
+++ b/src/tools/boost/boostc.h
@@ -17,19 +17,19 @@ namespace Boost
class CompilerC : public Compiler
{
private:
- virtual bool checkExecutableResult(bool withWine, QStringList &lines) const;
+ virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const;
};
class CompilerC16 : public CompilerC
{
public:
- virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc.pic16.exe"; }
+ virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc.pic16.exe"; }
};
class CompilerC18 : public CompilerC
{
public:
- virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc.pic18.exe"; }
+ virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc.pic18.exe"; }
};
//----------------------------------------------------------------------------
@@ -37,7 +37,7 @@ class GroupC : public Group
{
public:
GroupC() : Group(".c", "void main(void) {}\n") {}
- virtual QString informationText() const;
+ virtual TQString informationText() const;
virtual PURL::FileType implementationType(PURL::ToolType type) const { return (type==PURL::ToolType::Compiler ? PURL::CSource : PURL::Nb_FileTypes); }
private:
@@ -47,8 +47,8 @@ private:
class GroupC16 : public GroupC
{
public:
- virtual QString name() const { return "boostc16"; }
- virtual QString label() const { return i18n("BoostC Compiler for PIC16"); }
+ virtual TQString name() const { return "boostc16"; }
+ virtual TQString label() const { return i18n("BoostC Compiler for PIC16"); }
private:
virtual BaseData baseFactory(Tool::Category) const;
@@ -58,8 +58,8 @@ private:
class GroupC18 : public GroupC
{
public:
- virtual QString name() const { return "boostc18"; }
- virtual QString label() const { return i18n("BoostC Compiler for PIC18"); }
+ virtual TQString name() const { return "boostc18"; }
+ virtual TQString label() const { return i18n("BoostC Compiler for PIC18"); }
private:
virtual BaseData baseFactory(Tool::Category) const;
diff --git a/src/tools/boost/boostc_compile.cpp b/src/tools/boost/boostc_compile.cpp
index 2298361..3c18fbe 100644
--- a/src/tools/boost/boostc_compile.cpp
+++ b/src/tools/boost/boostc_compile.cpp
@@ -11,33 +11,33 @@
#include "boost_config.h"
//----------------------------------------------------------------------------
-void Boost::Process::logStderrLine(const QString &line)
+void Boost::Process::logStderrLine(const TQString &line)
{
if ( parseErrorLine(line, Compile::ParseErrorData("(.*)\\((\\d+).*\\): (error|warning):(.*)", 1, 2, 4, 3)) ) return;
- doLog(Log::LineType::Normal, line, QString::null, 0);
+ doLog(Log::LineType::Normal, line, TQString(), 0);
}
//----------------------------------------------------------------------------
-QStringList Boost::CompileFile::genericArguments(const Compile::Config &config) const
+TQStringList Boost::CompileFile::genericArguments(const Compile::Config &config) const
{
- QStringList args;
+ TQStringList args;
args += "-t %DEVICE";
args += "-i";
- args += config.includeDirs(Tool::Category::Compiler, "-I", QString::null, ";");
+ args += config.includeDirs(Tool::Category::Compiler, "-I", TQString(), ";");
args += config.customOptions(Tool::Category::Compiler);
args += "%I";
return args;
}
-QString Boost::CompileFile::outputFiles() const
+TQString Boost::CompileFile::outputFiles() const
{
return "obj";
}
//----------------------------------------------------------------------------
-QStringList Boost::Link::genericArguments(const Compile::Config &config) const
+TQStringList Boost::Link::genericArguments(const Compile::Config &config) const
{
- QStringList args;
+ TQStringList args;
args += "-t %DEVICE";
args += "-p";
args += "%PROJECT";
@@ -49,7 +49,7 @@ QStringList Boost::Link::genericArguments(const Compile::Config &config) const
return args;
}
-QString Boost::Link::outputFiles() const
+TQString Boost::Link::outputFiles() const
{
return "PURL::Lst PURL::Hex PURL::Coff PURL::AsmGPAsm stat tree casm";
}
diff --git a/src/tools/boost/boostc_compile.h b/src/tools/boost/boostc_compile.h
index 5c3696a..a6a95d1 100644
--- a/src/tools/boost/boostc_compile.h
+++ b/src/tools/boost/boostc_compile.h
@@ -17,28 +17,31 @@ namespace Boost
class Process : public Compile::Process
{
Q_OBJECT
+ TQ_OBJECT
protected:
- virtual QString deviceName() const { return "PIC" + _data.device; }
- virtual void logStderrLine(const QString &line);
+ virtual TQString deviceName() const { return "PIC" + _data.device; }
+ virtual void logStderrLine(const TQString &line);
};
//----------------------------------------------------------------------------
class CompileFile : public Process
{
Q_OBJECT
+ TQ_OBJECT
protected:
- virtual QStringList genericArguments(const Compile::Config &config) const;
- virtual QString outputFiles() const;
+ virtual TQStringList genericArguments(const Compile::Config &config) const;
+ virtual TQString outputFiles() const;
};
//----------------------------------------------------------------------------
class Link : public Process
{
Q_OBJECT
+ TQ_OBJECT
protected:
- virtual QString objectExtension() const { return "obj"; }
- virtual QStringList genericArguments(const Compile::Config &config) const;
- virtual QString outputFiles() const;
+ virtual TQString objectExtension() const { return "obj"; }
+ virtual TQStringList genericArguments(const Compile::Config &config) const;
+ virtual TQString outputFiles() const;
};
} // namespace
diff --git a/src/tools/boost/boostcpp.cpp b/src/tools/boost/boostcpp.cpp
index 8991de7..7b83314 100644
--- a/src/tools/boost/boostcpp.cpp
+++ b/src/tools/boost/boostcpp.cpp
@@ -12,15 +12,15 @@
#include "boost_generator.h"
//----------------------------------------------------------------------------
-bool Boost::CompilerCpp::checkExecutableResult(bool, QStringList &lines) const
+bool Boost::CompilerCpp::checkExecutableResult(bool, TQStringList &lines) const
{
return ( lines.count()>0 && lines[0].startsWith("BoostC++ ") );
}
//----------------------------------------------------------------------------
-QString Boost::GroupCpp::informationText() const
+TQString Boost::GroupCpp::informationText() const
{
- return i18n("<a href=\"%1\">BoostC++ Compiler</a> is a C compiler distributed by SourceBoost Technologies.").arg("http://www.sourceboost.com/Products/BoostCpp/Overview.html");
+ return i18n("<a href=\"%1\">BoostC++ Compiler</a> is a C compiler distributed by SourceBoost Technologies.").tqarg("http://www.sourceboost.com/Products/BoostCpp/Overview.html");
}
Tool::SourceGenerator *Boost::GroupCpp::sourceGeneratorFactory() const
diff --git a/src/tools/boost/boostcpp.h b/src/tools/boost/boostcpp.h
index bf5e2ee..7e3607d 100644
--- a/src/tools/boost/boostcpp.h
+++ b/src/tools/boost/boostcpp.h
@@ -17,19 +17,19 @@ namespace Boost
class CompilerCpp : public Compiler
{
private:
- virtual bool checkExecutableResult(bool withWine, QStringList &lines) const;
+ virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const;
};
class CompilerCpp16 : public CompilerCpp
{
public:
- virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc++.pic16.exe"; }
+ virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc++.pic16.exe"; }
};
class CompilerCpp18 : public CompilerCpp
{
public:
- virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc++.pic18.exe"; }
+ virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "boostc++.pic18.exe"; }
};
//----------------------------------------------------------------------------
@@ -37,7 +37,7 @@ class GroupCpp : public Group
{
public:
GroupCpp() : Group(".cpp", "void main(void) {}\n") {}
- virtual QString informationText() const;
+ virtual TQString informationText() const;
virtual PURL::FileType implementationType(PURL::ToolType type) const { return (type==PURL::ToolType::Compiler ? PURL::CppSource : PURL::Nb_FileTypes); }
private:
@@ -47,8 +47,8 @@ private:
class GroupCpp16 : public GroupCpp
{
public:
- virtual QString name() const { return "boostc++16"; }
- virtual QString label() const { return i18n("BoostC++ Compiler for PIC16"); }
+ virtual TQString name() const { return "boostc++16"; }
+ virtual TQString label() const { return i18n("BoostC++ Compiler for PIC16"); }
private:
virtual BaseData baseFactory(Tool::Category) const;
@@ -58,8 +58,8 @@ private:
class GroupCpp18 : public GroupCpp
{
public:
- virtual QString name() const { return "boostc++18"; }
- virtual QString label() const { return i18n("BoostC++ Compiler for PIC18"); }
+ virtual TQString name() const { return "boostc++18"; }
+ virtual TQString label() const { return i18n("BoostC++ Compiler for PIC18"); }
private:
virtual BaseData baseFactory(Tool::Category) const;
diff --git a/src/tools/boost/gui/boost_ui.h b/src/tools/boost/gui/boost_ui.h
index 6cafcf6..daa5047 100644
--- a/src/tools/boost/gui/boost_ui.h
+++ b/src/tools/boost/gui/boost_ui.h
@@ -18,6 +18,7 @@ namespace Boost
class ConfigWidget : public ToolConfigWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
ConfigWidget(Project *project);
virtual void initEntries();