diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-02 06:40:27 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-02 06:40:27 +0000 |
commit | 2595a15ebeb6fc46b7cb241d01ec0c2460ec2111 (patch) | |
tree | 18a8f0f4ac5a86dacfa74c3537551ec39bc85e75 /src/gui/combobox.cpp | |
parent | 1d90725a4001fab9d3922b2cbcceeee5e2d1686f (diff) | |
download | tellico-2595a15ebeb6fc46b7cb241d01ec0c2460ec2111.tar.gz tellico-2595a15ebeb6fc46b7cb241d01ec0c2460ec2111.zip |
TQt4 port tellico
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/tellico@1239054 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gui/combobox.cpp')
-rw-r--r-- | src/gui/combobox.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/combobox.cpp b/src/gui/combobox.cpp index 1aff29b..c5b3dfe 100644 --- a/src/gui/combobox.cpp +++ b/src/gui/combobox.cpp @@ -17,7 +17,7 @@ using Tellico::GUI::ComboBox; -ComboBox::ComboBox(QWidget* parent_) : KComboBox(parent_) { +ComboBox::ComboBox(TQWidget* tqparent_) : KComboBox(tqparent_) { setEditable(false); } @@ -26,19 +26,19 @@ void ComboBox::clear() { m_data.clear(); } -void ComboBox::insertItem(const QString& s_, const QVariant& t_, int idx_/* =-1 */) { +void ComboBox::insertItem(const TQString& s_, const TQVariant& t_, int idx_/* =-1 */) { KComboBox::insertItem(s_, idx_); if(idx_ < 0) { m_data.push_back(t_); } else { while(idx_ > static_cast<int>(m_data.count())) { - m_data.push_back(QVariant()); + m_data.push_back(TQVariant()); } m_data.insert(m_data.at(idx_), t_); } } -void ComboBox::insertItems(const QStringList& s_, const QValueList<QVariant>& t_, int idx_ /*=-1*/) { +void ComboBox::insertItems(const TQStringList& s_, const TQValueList<TQVariant>& t_, int idx_ /*=-1*/) { if(s_.count() != t_.count()) { kdWarning() << "ComboBox::insertItems() - must have equal number of items in list!" << endl; return; @@ -49,19 +49,19 @@ void ComboBox::insertItems(const QStringList& s_, const QValueList<QVariant>& t_ } } -const QVariant& ComboBox::currentData() const { +const TQVariant& ComboBox::currentData() const { return data(currentItem()); } -const QVariant& ComboBox::data(uint idx_) const { +const TQVariant& ComboBox::data(uint idx_) const { if(idx_ >= m_data.count()) { - static QVariant t; // inescapable + static TQVariant t; // inescapable return t; } return m_data[idx_]; } -void ComboBox::setCurrentData(const QVariant& data_) { +void ComboBox::setCurrentData(const TQVariant& data_) { for(uint i = 0; i < m_data.count(); ++i) { if(m_data[i] == data_) { setCurrentItem(i); |