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/devices/list | |
| 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/devices/list')
| -rw-r--r-- | src/devices/list/device_list.cpp | 6 | ||||
| -rw-r--r-- | src/devices/list/device_list.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/list/device_list.cpp b/src/devices/list/device_list.cpp index 1434ec8..87ea495 100644 --- a/src/devices/list/device_list.cpp +++ b/src/devices/list/device_list.cpp @@ -8,14 +8,14 @@ ***************************************************************************/ #include "device_list.h" -#include <qregexp.h> +#include <tqregexp.h> #include "devices/pic/pic/pic_group.h" #include "devices/mem24/mem24/mem24_group.h" const Device::AutoData Device::AUTO_DATA = { "*", I18N_NOOP("<auto>") }; -const Device::Data *Device::Lister::data(const QString &device) const +const Device::Data *Device::Lister::data(const TQString &device) const { for (ConstIterator it=begin(); it!=end(); it++) { const Data *data = static_cast<const Data *>(it.data()->deviceData(device).data); @@ -24,7 +24,7 @@ const Device::Data *Device::Lister::data(const QString &device) const return 0; } -QString Device::Lister::checkName(const QString &device) const +TQString Device::Lister::checkName(const TQString &device) const { if ( device==AUTO_DATA.name ) return device; if ( isSupported(device) ) return device; diff --git a/src/devices/list/device_list.h b/src/devices/list/device_list.h index 3d9fb78..6f00046 100644 --- a/src/devices/list/device_list.h +++ b/src/devices/list/device_list.h @@ -24,8 +24,8 @@ class Lister : public ::Group::Lister<GroupBase> { public: Lister(); - const Data *data(const QString &device) const; - QString checkName(const QString &device) const; + const Data *data(const TQString &device) const; + TQString checkName(const TQString &device) const; }; extern const Lister &lister(); |