diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-30 00:15:53 +0000 |
commit | 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 (patch) | |
tree | b95c0ca86c4876dd139af376b9f4afd8917cf0cd /src/tools/c18 | |
parent | b79a2c28534cf09987eeeba3077fff9236df182a (diff) | |
download | piklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.tar.gz piklab-0aaa8e3fc8f8a1481333b564f0922277c8d8ad59.zip |
TQt4 port piklab
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/tools/c18')
-rw-r--r-- | src/tools/c18/c18.cpp | 18 | ||||
-rw-r--r-- | src/tools/c18/c18.h | 20 | ||||
-rw-r--r-- | src/tools/c18/c18_compile.cpp | 20 | ||||
-rw-r--r-- | src/tools/c18/c18_compile.h | 17 | ||||
-rw-r--r-- | src/tools/c18/c18_config.h | 2 | ||||
-rw-r--r-- | src/tools/c18/gui/c18_ui.cpp | 8 | ||||
-rw-r--r-- | src/tools/c18/gui/c18_ui.h | 3 |
7 files changed, 46 insertions, 42 deletions
diff --git a/src/tools/c18/c18.cpp b/src/tools/c18/c18.cpp index 4eb5bfd..5c2b725 100644 --- a/src/tools/c18/c18.cpp +++ b/src/tools/c18/c18.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "c18.h" -#include <qdir.h> +#include <tqdir.h> #include "c18_compile.h" #include "c18_config.h" @@ -18,21 +18,21 @@ #include "common/global/process.h" //---------------------------------------------------------------------------- -bool C18::Compiler::checkExecutableResult(bool, QStringList &lines) const +bool C18::Compiler::checkExecutableResult(bool, TQStringList &lines) const { return ( lines.count()>0 && lines[0].startsWith("MPLAB C18") ); } -bool C18::Linker::checkExecutableResult(bool, QStringList &lines) const +bool C18::Linker::checkExecutableResult(bool, TQStringList &lines) const { return ( lines.count()>0 && lines[0].startsWith("MPLINK") ); } //---------------------------------------------------------------------------- -QValueList<const Device::Data *> C18::Group::getSupportedDevices(const QString &) const +TQValueList<const Device::Data *> C18::Group::getSupportedDevices(const TQString &) const { - QValueVector<QString> devices = Device::lister().group("pic")->supportedDevices(); - QValueList<const Device::Data *> list; + TQValueVector<TQString> devices = Device::lister().group("pic")->supportedDevices(); + TQValueList<const Device::Data *> list; for (uint i=0; i<devices.count(); i++) { const Device::Data *data = Device::lister().data(devices[i]); if ( static_cast<const Pic::Data *>(data)->is18Family() ) list.append(data); @@ -49,7 +49,7 @@ Compile::Process *C18::Group::processFactory(const Compile::Data &data) const PURL::Directory C18::Group::autodetectDirectory(Compile::DirectoryType type, const PURL::Directory &execDir, bool) const { - QDir dir(execDir.path()); + TQDir dir(execDir.path()); if ( !dir.cdUp() ) return PURL::Directory(); switch (type.type()) { case Compile::DirectoryType::LinkerScript: @@ -80,7 +80,7 @@ Tool::Group::BaseData C18::Group::baseFactory(Tool::Category category) const return BaseData(); } -QString C18::Group::informationText() const +TQString C18::Group::informationText() const { - return i18n("<qt><a href=\"%1\">C18</a> is a C compiler distributed by Microchip.</qt>").arg("http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010014&part=SW006011"); + return i18n("<qt><a href=\"%1\">C18</a> is a C compiler distributed by Microchip.</qt>").tqarg("http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en010014&part=SW006011"); } diff --git a/src/tools/c18/c18.h b/src/tools/c18/c18.h index fac739e..7560f78 100644 --- a/src/tools/c18/c18.h +++ b/src/tools/c18/c18.h @@ -17,30 +17,30 @@ namespace C18 class Compiler : public Tool::Base { public: - virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "mcc18"; } + virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "mcc18"; } private: - virtual QStringList checkExecutableOptions(bool) const { return "-v"; } - virtual bool checkExecutableResult(bool withWine, QStringList &lines) const; + virtual TQStringList checkExecutableOptions(bool) const { return "-v"; } + virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const; }; class Linker : public Tool::Base { public: - virtual QString baseExecutable(bool, Tool::OutputExecutableType) const { return "mplink"; } + virtual TQString baseExecutable(bool, Tool::OutputExecutableType) const { return "mplink"; } private: - virtual QStringList checkExecutableOptions(bool) const { return "/v"; } - virtual bool checkExecutableResult(bool withWine, QStringList &lines) const; + virtual TQStringList checkExecutableOptions(bool) const { return "/v"; } + virtual bool checkExecutableResult(bool withWine, TQStringList &lines) const; }; //---------------------------------------------------------------------------- class Group : public Tool::Group { public: - virtual QString name() const { return "c18"; } - virtual QString label() const { return i18n("C18 Compiler"); } - virtual QString informationText() const; + virtual TQString name() const { return "c18"; } + virtual TQString label() const { return i18n("C18 Compiler"); } + virtual TQString informationText() const; virtual Tool::Category checkDevicesCategory() const { return Tool::Category::Nb_Types; } virtual bool hasDirectory(Compile::DirectoryType type) const { return ( type!=Compile::DirectoryType::Source ); } virtual PURL::FileType linkerScriptType() const { return PURL::Lkr; } @@ -50,7 +50,7 @@ public: virtual PURL::FileType implementationType(PURL::ToolType type) const { return (type==PURL::ToolType::Compiler ? PURL::CSource : PURL::Nb_FileTypes); } private: - 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; virtual BaseData baseFactory(Tool::Category category) const; diff --git a/src/tools/c18/c18_compile.cpp b/src/tools/c18/c18_compile.cpp index 181da36..d3ca920 100644 --- a/src/tools/c18/c18_compile.cpp +++ b/src/tools/c18/c18_compile.cpp @@ -13,9 +13,9 @@ #include "devices/list/device_list.h" //----------------------------------------------------------------------------- -QStringList C18::CompileFile::genericArguments(const Compile::Config &config) const +TQStringList C18::CompileFile::genericArguments(const Compile::Config &config) const { - QStringList args; + TQStringList args; args += config.includeDirs(Tool::Category::Compiler, "-I"); args += "-I" + Compile::Config::directory(group(), Compile::DirectoryType::Header).path(); args += "$NO_AUTO_DEVICE(-p)"; @@ -26,21 +26,21 @@ QStringList C18::CompileFile::genericArguments(const Compile::Config &config) co return args; } -QString C18::CompileFile::outputFiles() const +TQString C18::CompileFile::outputFiles() const { return "PURL::Object"; } -void C18::CompileFile::logStderrLine(const QString &line) +void C18::CompileFile::logStderrLine(const TQString &line) { // #### TODO - doLog(Log::LineType::Normal, line, QString::null, 0); + doLog(Log::LineType::Normal, line, TQString(), 0); } //----------------------------------------------------------------------------- -QStringList C18::Link::genericArguments(const Compile::Config &config) const +TQStringList C18::Link::genericArguments(const Compile::Config &config) const { - QStringList args; + TQStringList args; args += "/k%LKR_PATH"; args += "%LKR_NAME"; args += "/l" + Compile::Config::directory(group(), Compile::DirectoryType::Library).path(); @@ -53,13 +53,13 @@ QStringList C18::Link::genericArguments(const Compile::Config &config) const return args; } -QString C18::Link::outputFiles() const +TQString C18::Link::outputFiles() const { return "PURL::Lkr PURL::Map PURL::Hex PURL::Coff PURL::Lst PURL::Cod"; } -void C18::Link::logStderrLine(const QString &line) +void C18::Link::logStderrLine(const TQString &line) { // #### TODO - doLog(Log::LineType::Normal, line, QString::null, 0); + doLog(Log::LineType::Normal, line, TQString(), 0); } diff --git a/src/tools/c18/c18_compile.h b/src/tools/c18/c18_compile.h index 74f0f06..1d690df 100644 --- a/src/tools/c18/c18_compile.h +++ b/src/tools/c18/c18_compile.h @@ -17,28 +17,31 @@ namespace C18 class Process : public Compile::Process { Q_OBJECT + TQ_OBJECT protected: - virtual QString deviceName() const { return _data.device.lower(); } + virtual TQString deviceName() const { return _data.device.lower(); } }; //----------------------------------------------------------------------------- class CompileFile : public Process { Q_OBJECT + TQ_OBJECT protected: - virtual QStringList genericArguments(const Compile::Config &config) const; - virtual QString outputFiles() const; - virtual void logStderrLine(const QString &line); + virtual TQStringList genericArguments(const Compile::Config &config) const; + virtual TQString outputFiles() const; + virtual void logStderrLine(const TQString &line); }; //----------------------------------------------------------------------------- class Link : public Process { Q_OBJECT + TQ_OBJECT protected: - virtual QStringList genericArguments(const Compile::Config &config) const; - virtual QString outputFiles() const; - virtual void logStderrLine(const QString &line); + virtual TQStringList genericArguments(const Compile::Config &config) const; + virtual TQString outputFiles() const; + virtual void logStderrLine(const TQString &line); }; } // namespace diff --git a/src/tools/c18/c18_config.h b/src/tools/c18/c18_config.h index dead1a1..db49ad7 100644 --- a/src/tools/c18/c18_config.h +++ b/src/tools/c18/c18_config.h @@ -20,7 +20,7 @@ public: Config(Project *project) : Compile::Config(project) {} enum { Nb_WarningLevels = 3 }; static const char * const WARNING_LEVEL_LABELS[Nb_WarningLevels]; - uint warningLevel() const { return QMIN(Compile::Config::warningLevel(Tool::Category::Compiler), uint(Nb_WarningLevels)); } + uint warningLevel() const { return TQMIN(Compile::Config::warningLevel(Tool::Category::Compiler), uint(Nb_WarningLevels)); } void setWarningLevel(uint level) { Compile::Config::setWarningLevel(Tool::Category::Compiler, level); } }; diff --git a/src/tools/c18/gui/c18_ui.cpp b/src/tools/c18/gui/c18_ui.cpp index c10f328..5d0c167 100644 --- a/src/tools/c18/gui/c18_ui.cpp +++ b/src/tools/c18/gui/c18_ui.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "c18_ui.h" -#include <qlabel.h> +#include <tqlabel.h> #include "tools/c18/c18_config.h" //---------------------------------------------------------------------------- @@ -20,10 +20,10 @@ void C18::ConfigWidget::initEntries() { if ( _category==Tool::Category::Compiler ) { uint row = container()->numRows(); - QLabel *label = new QLabel(i18n("Warning level:"), container()); + TQLabel *label = new TQLabel(i18n("Warning level:"), container()); container()->addWidget(label, row,row, 0,0); - _warningLevel = new QComboBox(container()); - connect(_warningLevel, SIGNAL(activated(int)), SIGNAL(changed())); + _warningLevel = new TQComboBox(container()); + connect(_warningLevel, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); for (uint i=0; i<Config::Nb_WarningLevels; i++) _warningLevel->insertItem(i18n(Config::WARNING_LEVEL_LABELS[i])); container()->addWidget(_warningLevel, row,row, 1,1); diff --git a/src/tools/c18/gui/c18_ui.h b/src/tools/c18/gui/c18_ui.h index d7d45c4..8ccb638 100644 --- a/src/tools/c18/gui/c18_ui.h +++ b/src/tools/c18/gui/c18_ui.h @@ -18,11 +18,12 @@ namespace C18 class ConfigWidget : public ToolConfigWidget { Q_OBJECT + TQ_OBJECT public: ConfigWidget(Project *project); private: - QComboBox *_warningLevel; + TQComboBox *_warningLevel; virtual void initEntries(); virtual void loadConfig(const Compile::Config &config); virtual void saveConfig(Compile::Config &config) const; |