diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-05 06:00:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-05 06:00:29 +0000 |
commit | fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 (patch) | |
tree | 6b8614802f0d01b353bc9ba78aff2090846c198e /kmymoney2/wizards/wizardpages | |
parent | dadc34655c3ab961b0b0b94a10eaaba710f0b5e8 (diff) | |
download | kmymoney-fecb0e67b23e8b83ba7fc881bb57bc48c0852d62.tar.gz kmymoney-fecb0e67b23e8b83ba7fc881bb57bc48c0852d62.zip |
TQt4 port kmymoney
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1239855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmymoney2/wizards/wizardpages')
-rw-r--r-- | kmymoney2/wizards/wizardpages/accounts.cpp | 6 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/accounts.h | 3 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/accountsdecl.ui | 9 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/currency.cpp | 18 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/currency.h | 7 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/currencydecl.ui | 6 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/userinfo.cpp | 4 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/userinfo.h | 3 | ||||
-rw-r--r-- | kmymoney2/wizards/wizardpages/userinfodecl.ui | 38 |
9 files changed, 50 insertions, 44 deletions
diff --git a/kmymoney2/wizards/wizardpages/accounts.cpp b/kmymoney2/wizards/wizardpages/accounts.cpp index 0a6c82b..21c80ad 100644 --- a/kmymoney2/wizards/wizardpages/accounts.cpp +++ b/kmymoney2/wizards/wizardpages/accounts.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qheader.h> +#include <tqheader.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -31,8 +31,8 @@ #include "accounts.h" -Accounts::Accounts(QWidget* parent, const char* name) : - AccountsDecl(parent, name) +Accounts::Accounts(TQWidget* tqparent, const char* name) : + AccountsDecl(tqparent, name) { } diff --git a/kmymoney2/wizards/wizardpages/accounts.h b/kmymoney2/wizards/wizardpages/accounts.h index d1f3175..0c36c31 100644 --- a/kmymoney2/wizards/wizardpages/accounts.h +++ b/kmymoney2/wizards/wizardpages/accounts.h @@ -32,8 +32,9 @@ class Accounts : public AccountsDecl { Q_OBJECT + TQ_OBJECT public: - Accounts(QWidget* parent = 0, const char* name = 0); + Accounts(TQWidget* tqparent = 0, const char* name = 0); private: }; diff --git a/kmymoney2/wizards/wizardpages/accountsdecl.ui b/kmymoney2/wizards/wizardpages/accountsdecl.ui index 9e7b7c9..c04d1b4 100644 --- a/kmymoney2/wizards/wizardpages/accountsdecl.ui +++ b/kmymoney2/wizards/wizardpages/accountsdecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AccountsDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AccountsDecl</cstring> </property> @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -50,5 +50,8 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kaccounttemplateselector.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/wizardpages/currency.cpp b/kmymoney2/wizards/wizardpages/currency.cpp index 8693089..d824f01 100644 --- a/kmymoney2/wizards/wizardpages/currency.cpp +++ b/kmymoney2/wizards/wizardpages/currency.cpp @@ -29,24 +29,24 @@ #include "currency.h" -Currency::Currency(QWidget* parent, const char* name) : - CurrencyDecl(parent, name) +Currency::Currency(TQWidget* tqparent, const char* name) : + CurrencyDecl(tqparent, name) { m_currencyList->setAllColumnsShowFocus(true); m_currencyList->setMultiSelection(false); } -QListViewItem* Currency::insertCurrency(const MyMoneySecurity& sec) +TQListViewItem* Currency::insertCurrency(const MyMoneySecurity& sec) { - return new KListViewItem(m_currencyList, sec.name(), QString(sec.id()), sec.tradingSymbol()); + return new KListViewItem(m_currencyList, sec.name(), TQString(sec.id()), sec.tradingSymbol()); } void Currency::selectCurrency(const MyMoneySecurity& sec) { - QListViewItem* it_v; - QListViewItemIterator it(m_currencyList); + TQListViewItem* it_v; + TQListViewItemIterator it(m_currencyList); while((it_v = it.current()) != 0) { - if(it_v->text(1) == QString(sec.id())) { + if(it_v->text(1) == TQString(sec.id())) { m_currencyList->setSelected(it_v, true); m_currencyList->ensureItemVisible(it_v); break; @@ -54,9 +54,9 @@ void Currency::selectCurrency(const MyMoneySecurity& sec) } } -QString Currency::selectedCurrency(void) const +TQString Currency::selectedCurrency(void) const { - QString id; + TQString id; if(m_currencyList->selectedItem()) { id = m_currencyList->selectedItem()->text(1); } diff --git a/kmymoney2/wizards/wizardpages/currency.h b/kmymoney2/wizards/wizardpages/currency.h index 1ce2649..d202f35 100644 --- a/kmymoney2/wizards/wizardpages/currency.h +++ b/kmymoney2/wizards/wizardpages/currency.h @@ -35,11 +35,12 @@ class KListViewItem; class Currency : public CurrencyDecl { Q_OBJECT + TQ_OBJECT public: - Currency(QWidget* parent = 0, const char* name = 0); - QListViewItem* insertCurrency(const MyMoneySecurity& sec); + Currency(TQWidget* tqparent = 0, const char* name = 0); + TQListViewItem* insertCurrency(const MyMoneySecurity& sec); void selectCurrency(const MyMoneySecurity& sec); - QString selectedCurrency(void) const; + TQString selectedCurrency(void) const; }; #endif diff --git a/kmymoney2/wizards/wizardpages/currencydecl.ui b/kmymoney2/wizards/wizardpages/currencydecl.ui index f2b857a..354dfc3 100644 --- a/kmymoney2/wizards/wizardpages/currencydecl.ui +++ b/kmymoney2/wizards/wizardpages/currencydecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>CurrencyDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CurrencyDecl</cstring> </property> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -92,5 +92,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/wizardpages/userinfo.cpp b/kmymoney2/wizards/wizardpages/userinfo.cpp index 412c5a1..01d5e69 100644 --- a/kmymoney2/wizards/wizardpages/userinfo.cpp +++ b/kmymoney2/wizards/wizardpages/userinfo.cpp @@ -30,8 +30,8 @@ #include "userinfo.h" #include <kmymoney/mymoneypayee.h> -UserInfo::UserInfo(QWidget* parent, const char* name) : - UserInfoDecl(parent, name) +UserInfo::UserInfo(TQWidget* tqparent, const char* name) : + UserInfoDecl(tqparent, name) { m_userNameEdit->setFocus(); } diff --git a/kmymoney2/wizards/wizardpages/userinfo.h b/kmymoney2/wizards/wizardpages/userinfo.h index 9242868..9168bf9 100644 --- a/kmymoney2/wizards/wizardpages/userinfo.h +++ b/kmymoney2/wizards/wizardpages/userinfo.h @@ -33,8 +33,9 @@ class MyMoneyPayee; class UserInfo : public UserInfoDecl { Q_OBJECT + TQ_OBJECT public: - UserInfo(QWidget* parent = 0, const char* name = 0); + UserInfo(TQWidget* tqparent = 0, const char* name = 0); MyMoneyPayee user(void) const; private: diff --git a/kmymoney2/wizards/wizardpages/userinfodecl.ui b/kmymoney2/wizards/wizardpages/userinfodecl.ui index 4240d49..205e6d2 100644 --- a/kmymoney2/wizards/wizardpages/userinfodecl.ui +++ b/kmymoney2/wizards/wizardpages/userinfodecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>UserInfoDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UserInfoDecl</cstring> </property> @@ -34,11 +34,11 @@ <cstring>m_userNameEdit</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -48,11 +48,11 @@ <string>Town:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -62,11 +62,11 @@ <string>County/State:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -96,11 +96,11 @@ <cstring>m_telephoneEdit</cstring> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -110,11 +110,11 @@ <string>Email:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -124,7 +124,7 @@ <string>Telephone:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -132,9 +132,9 @@ <string>Your name:</string> </property> </widget> - <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="4"> + <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>305</width> <height>21</height> @@ -177,7 +177,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -189,11 +189,11 @@ <cstring>m_countyEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -221,5 +221,5 @@ <tabstop>m_loadAddressButton</tabstop> <tabstop>kActiveLabel1</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |