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/piklab-prog/cli_prog_manager.cpp | |
| 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/piklab-prog/cli_prog_manager.cpp')
| -rw-r--r-- | src/piklab-prog/cli_prog_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/piklab-prog/cli_prog_manager.cpp b/src/piklab-prog/cli_prog_manager.cpp index 472757a..f8b73d1 100644 --- a/src/piklab-prog/cli_prog_manager.cpp +++ b/src/piklab-prog/cli_prog_manager.cpp @@ -22,10 +22,10 @@ Port::Description Programmer::CliManager::portDescription() const log->log(Log::LineType::Information, i18n("Using port from configuration file.")); return Programmer::GroupConfig::portDescription(group()); } - if ( CLI::_port=="usb" ) return Port::Description(PortType::USB, QString::null); + if ( CLI::_port=="usb" ) return Port::Description(PortType::USB, TQString()); PortType type = Port::findType(CLI::_port); if ( type==PortType::Nb_Types ) { - log->log(Log::LineType::Warning, i18n("Could not find device \"%1\" as serial or parallel port. Will try to open as serial port.").arg(CLI::_port)); + log->log(Log::LineType::Warning, i18n("Could not find device \"%1\" as serial or parallel port. Will try to open as serial port.").tqarg(CLI::_port)); type = PortType::Serial; } return Port::Description(type, CLI::_port); |