diff options
Diffstat (limited to 'kmymoney2/wizards')
33 files changed, 539 insertions, 472 deletions
diff --git a/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui b/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui index d68bc4b..400f810 100644 --- a/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kaccountsummarypagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KAccountSummaryPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KAccountSummaryPageDecl</cstring> </property> @@ -76,5 +76,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui index bb6c5b7..8c1c8c1 100644 --- a/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KAccountTypePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KAccountTypePageDecl</cstring> </property> @@ -29,9 +29,9 @@ Select the type for the new account. Use the <b>What's this?</b> fea Enter the date the account was opened and its currency.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -53,7 +53,7 @@ Enter the date the account was opened and its currency.</string> <string>Select the currency in which this account is denominated.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -61,7 +61,7 @@ Enter the date the account was opened and its currency.</string> <string>Currency</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -73,7 +73,7 @@ Enter the date the account was opened and its currency.</string> <property name="name"> <cstring>m_openingBalance</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> @@ -89,7 +89,7 @@ Enter the date the account was opened and its currency.</string> <string>The opening balance is the balance of the account when you start using it with KMyMoney. For new accounts this is usually 0 but for existing accounts this may well differ. Please consult the account statements to figure out this value. The opening balance is to be provided in the currency of the account as selected with the currency button.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>m_conversionLabel</cstring> </property> @@ -110,7 +110,7 @@ Enter the date the account was opened and its currency.</string> <i>Note</i>: If you do not know the exact amount of the opening balance, enter an estimate. You can change this value later before you reconcile this account for the first time.</string> </property> </widget> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>m_conversionExample</cstring> </property> @@ -118,7 +118,7 @@ Enter the date the account was opened and its currency.</string> <string>xxx</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -137,7 +137,7 @@ Enter the date the account was opened and its currency.</string> <string>For foreign currencies an initial conversion rate needs to be provided. This should be the price of the foreign currency in the base currency on the opening date of the account.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -145,7 +145,7 @@ Enter the date the account was opened and its currency.</string> <string>Account name</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -192,7 +192,7 @@ Use the asset account type to manage assets (e.g. your house, car or art collect Use the liability account type to manage any type of liability except amortization loans. Use it for taxes you owe or money you borrowed from friends. For amortization loans like mortgages you should create a loan account.</p></string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_preferredAccount</cstring> </property> @@ -216,7 +216,7 @@ Use the liability account type to manage any type of liability except amortizati <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>231</width> <height>20</height> @@ -257,7 +257,7 @@ Use the liability account type to manage any type of liability except amortizati <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -276,7 +276,7 @@ Use the liability account type to manage any type of liability except amortizati <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -285,5 +285,9 @@ Use the liability account type to manage any type of liability except amortizati </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui index bc388a8..ab4d614 100644 --- a/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KBrokeragePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KBrokeragePageDecl</cstring> </property> @@ -31,7 +31,7 @@ <b>Uncheck</b> it if you don't use this account for active stock brokerage. You should also uncheck it if this account is not maintained by a bank or broker.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_createBrokerageButton</cstring> </property> @@ -39,7 +39,7 @@ <string>Create brokerage account</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_currencyFrame</cstring> </property> @@ -59,15 +59,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -88,7 +88,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>m_accountNumberLabel</cstring> </property> @@ -101,7 +101,7 @@ <cstring>m_accountNumber</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>m_ibanLabel</cstring> </property> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>30</height> @@ -168,5 +168,8 @@ <tabstop>m_accountNumber</tabstop> <tabstop>m_iban</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycurrencyselector.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui b/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui index db13917..495e47b 100644 --- a/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KGeneralLoanInfoPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KGeneralLoanInfoPageDecl</cstring> </property> @@ -27,23 +27,23 @@ <string>Please select the required options. Please use the <b>What's this?</b> feature to see more information about the items.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -66,7 +66,7 @@ <cstring>m_loanDirection</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -84,7 +84,7 @@ If the name does not exist within KMyMoney's database, you are asked if you want to create it.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -112,7 +112,7 @@ If the name does not exist within KMyMoney's database, you are asked if you want Note: Payments made to obtain the loan (e.g. Disagio) are not considered as payments in this context.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -143,7 +143,7 @@ The option to <b>start from the beginning of the current year</b> is </qt></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -162,7 +162,7 @@ The option to <b>start from the beginning of the current year</b> is <string>You have selected to record only payments from the beginning of this year. Since prior transactions will not be recorded, you need to supply the balance of the loan on January 1st of this year.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -178,7 +178,7 @@ The option to <b>start from the beginning of the current year</b> is <enum>TabFocus</enum> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -194,7 +194,7 @@ The option to <b>start from the beginning of the current year</b> is <string>Select the frequency with which the interest is compounded. If uncertain, select the same as the payment frequency. Consult your loan contract for details.</string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -219,7 +219,7 @@ Enter the due date of the very first payment<p> Enter the due date of the first payment in the current year</string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -242,7 +242,7 @@ Enter the due date of the first payment in the current year</string> <cstring>m_interestType</cstring> </property> </widget> - <widget class="QLabel" row="9" column="0"> + <widget class="TQLabel" row="9" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -250,9 +250,9 @@ Enter the due date of the first payment in the current year</string> <string>Time between interest changes</string> </property> </widget> - <widget class="QLayoutWidget" row="9" column="1"> + <widget class="TQLayoutWidget" row="9" column="1"> <property name="name"> - <cstring>layout48</cstring> + <cstring>tqlayout48</cstring> </property> <hbox> <property name="name"> @@ -296,7 +296,7 @@ Enter the due date of the first payment in the current year</string> </widget> </hbox> </widget> - <widget class="QLabel" row="10" column="0"> + <widget class="TQLabel" row="10" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -324,7 +324,7 @@ Enter the due date of the first payment in the current year</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>29</width> <height>20</height> @@ -343,7 +343,7 @@ Enter the due date of the first payment in the current year</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -354,5 +354,10 @@ Enter the due date of the first payment in the current year</string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui b/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui index 00602e4..ad74cb1 100644 --- a/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KHierarchyPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KHierarchyPageDecl</cstring> </property> @@ -32,10 +32,10 @@ <enum>NoFocus</enum> </property> <property name="text"> - <string>This page allows you to select the parent account.</string> + <string>This page allows you to select the tqparent account.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_subAccountLabel</cstring> </property> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -78,5 +78,5 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui b/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui index ee38d48..fc2591f 100644 --- a/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KInstitutionPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KInstitutionPageDecl</cstring> </property> @@ -31,23 +31,23 @@ Enter the account number used by the institution to identify the account.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -71,7 +71,7 @@ Enter the account number used by the institution to identify the account.</strin <string>New Institution</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -89,7 +89,7 @@ Enter the account number used by the institution to identify the account.</strin KMyMoney currently uses this number only for some online banking functions.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -124,7 +124,7 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>132</width> <height>20</height> @@ -143,7 +143,7 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -152,5 +152,5 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui index eebb158..4229f78 100644 --- a/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KLoanDetailsPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KLoanDetailsPageDecl</cstring> </property> @@ -37,30 +37,30 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>70</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -83,7 +83,7 @@ <cstring>m_paymentDue</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -102,7 +102,7 @@ <string>Enter the amount of the loan in this field. If you want to calculate this field out of the other parameters, please leave it empty. If the field is marked as required (colored background) you have informed KMyMoney about the fact that there were already some payments towards the loan. In this case, please enter the ending balance of your last statement.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -118,7 +118,7 @@ <string>Please enter the interest rate in percent or leave the field empty to calculate it.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -126,9 +126,9 @@ <string>Term</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -152,7 +152,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -168,7 +168,7 @@ <string>Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -184,9 +184,9 @@ <string>Please enter the amount of a final amortization payment or leave the field empty to calculate it.</string> </property> </widget> - <widget class="QLayoutWidget" row="6" column="1"> + <widget class="TQLayoutWidget" row="6" column="1"> <property name="name"> - <cstring>layout53</cstring> + <cstring>tqlayout53</cstring> </property> <hbox> <property name="name"> @@ -202,7 +202,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -254,7 +254,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>27</width> <height>21</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -284,5 +284,10 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui index 51ac286..360d5b0 100644 --- a/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KLoanPaymentPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KLoanPaymentPageDecl</cstring> </property> @@ -27,9 +27,9 @@ <string>Now enter the information required for the periodic loan payments. If your regular payments contains any additional fees, click on the <b>Additional fees</b> button to enter them.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -45,22 +45,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>63</width> <height>21</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ <string>Principal + Interest</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_basePayment</cstring> </property> @@ -80,11 +80,11 @@ <property name="text"> <string>xxx</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -100,7 +100,7 @@ <string>Additional fees</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>m_additionalFees</cstring> </property> @@ -112,11 +112,11 @@ <property name="text"> <string>xxx</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -124,7 +124,7 @@ <string>= periodical payments</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>m_totalPayment</cstring> </property> @@ -136,7 +136,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>62</width> <height>21</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -180,5 +180,10 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui index 1270efe..b7f0c06 100644 --- a/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KLoanPayoutPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KLoanPayoutPageDecl</cstring> </property> @@ -28,7 +28,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a checking account instead.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_noPayoutTransaction</cstring> </property> @@ -36,7 +36,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <string>Don't create payout transaction</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_payoutDetailFrame</cstring> </property> @@ -53,7 +53,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>m_refinanceLoan</cstring> </property> @@ -64,7 +64,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <string>Check this if you are refinancing a loan that already exists in KMyMoney</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -93,7 +93,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <string>Create</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -117,7 +117,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </sizepolicy> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -135,7 +135,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -159,7 +159,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -194,5 +194,10 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui index bead410..b4f55a7 100644 --- a/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KLoanSchedulePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KLoanSchedulePageDecl</cstring> </property> @@ -28,23 +28,23 @@ If you selected to record all payments this date has already been supplied. If you selected to record only this years payments, then the <b>First payment due date</b> is the date of the first payment made in this year.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout54</cstring> + <cstring>tqlayout54</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout53</cstring> + <cstring>tqlayout53</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -60,7 +60,7 @@ If you selected to record all payments this date has already been supplied. If y <string>The category the interest part of the payment will be assigned to. If you borrow money you usually have to pay interest, so this should be an expense category. If you lend the money, you receive the interest. In this case, select an income category here.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -76,7 +76,7 @@ If you selected to record all payments this date has already been supplied. If y <string>Select the account from which you make your periodical payments or where you receive regular payments in case you lend the money. In most cases, this is a checking account.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -84,9 +84,9 @@ If you selected to record all payments this date has already been supplied. If y <string>First payment due on</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>layout52</cstring> + <cstring>tqlayout52</cstring> </property> <hbox> <property name="name"> @@ -102,7 +102,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -128,7 +128,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -147,7 +147,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -156,5 +156,10 @@ If you selected to record all payments this date has already been supplied. If y </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp index 1bfae86..3a42120 100644 --- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp +++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp @@ -20,11 +20,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> -#include <qfocusdata.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqfocusdata.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -76,8 +76,8 @@ namespace NewAccountWizard { StepFinish }; }; -NewAccountWizard::Wizard::Wizard(QWidget *parent, const char *name, bool modal, WFlags flags) - : KMyMoneyWizard(parent, name, modal, flags) +NewAccountWizard::Wizard::Wizard(TQWidget *tqparent, const char *name, bool modal, WFlags flags) + : KMyMoneyWizard(tqparent, name, modal, flags) { setTitle(i18n("KMyMoney New Account Setup")); addStep(i18n("Institution")); @@ -195,20 +195,20 @@ MyMoneyTransaction NewAccountWizard::Wizard::payoutTransaction(void) s.setValue(-s.value()); s.setAccountId(m_loanPayoutPage->payoutAccountId()); MyMoneyMoney shares; - KCurrencyCalculator::setupSplitPrice(shares, t, s, QMap<QString, MyMoneyMoney>(), this); + KCurrencyCalculator::setupSplitPrice(shares, t, s, TQMap<TQString, MyMoneyMoney>(), this); s.setShares(shares); t.addSplit(s); } return t; } -const MyMoneyAccount& NewAccountWizard::Wizard::parentAccount(void) +const MyMoneyAccount& NewAccountWizard::Wizard::tqparentAccount(void) { return m_accountTypePage->allowsParentAccount() - ? m_hierarchyPage->parentAccount() + ? m_hierarchyPage->tqparentAccount() : ( m_accountTypePage->accountType() == MyMoneyAccount::Loan - ? m_generalLoanInfoPage->parentAccount() - : m_accountTypePage->parentAccount() ); + ? m_generalLoanInfoPage->tqparentAccount() + : m_accountTypePage->tqparentAccount() ); } MyMoneyAccount NewAccountWizard::Wizard::brokerageAccount(void) const @@ -261,7 +261,7 @@ const MyMoneySchedule& NewAccountWizard::Wizard::schedule(void) m_schedule.setTransaction(t); } else if(m_account.isLoan()) { - m_schedule.setName(i18n("Loan payment for %1").arg(m_accountTypePage->m_accountName->text())); + m_schedule.setName(i18n("Loan payment for %1").tqarg(m_accountTypePage->m_accountName->text())); m_schedule.setType(MyMoneySchedule::TYPE_LOANPAYMENT); if(moneyBorrowed()) m_schedule.setPaymentType(MyMoneySchedule::STYPE_DIRECTDEBIT); @@ -304,9 +304,9 @@ const MyMoneySchedule& NewAccountWizard::Wizard::schedule(void) t.addSplit(s); // additional fee splits - QValueList<MyMoneySplit> additionalSplits; + TQValueList<MyMoneySplit> additionalSplits; m_loanPaymentPage->additionalFeesSplits(additionalSplits); - QValueList<MyMoneySplit>::const_iterator it; + TQValueList<MyMoneySplit>::const_iterator it; MyMoneyMoney factor(moneyBorrowed() ? 1 : -1, 1); for(it = additionalSplits.begin(); it != additionalSplits.end(); ++it) { @@ -364,7 +364,7 @@ bool NewAccountWizard::Wizard::moneyBorrowed(void) const class NewAccountWizard::InstitutionPage::Private { public: - QValueList<MyMoneyInstitution> m_list; + TQValueList<MyMoneyInstitution> m_list; }; InstitutionPage::InstitutionPage(Wizard* wizard, const char* name) : @@ -372,9 +372,9 @@ InstitutionPage::InstitutionPage(Wizard* wizard, const char* name) : WizardPage<Wizard>(StepInstitution, this, wizard, name), d(new Private()) { - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); - connect(m_newInstitutionButton, SIGNAL(clicked()), this, SLOT(slotNewInstitution())); - connect(m_institutionComboBox, SIGNAL(activated(int)), this, SLOT(slotSelectInstitution(int))); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); + connect(m_newInstitutionButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewInstitution())); + connect(m_institutionComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectInstitution(int))); slotLoadWidgets(); m_institutionComboBox->setCurrentItem(0); @@ -394,7 +394,7 @@ void InstitutionPage::slotLoadWidgets(void) MyMoneyFile::instance()->institutionList(d->m_list); qHeapSort(d->m_list); - QValueList<MyMoneyInstitution>::const_iterator it_l; + TQValueList<MyMoneyInstitution>::const_iterator it_l; m_institutionComboBox->insertItem(""); for(it_l = d->m_list.begin(); it_l != d->m_list.end(); ++it_l) { m_institutionComboBox->insertItem((*it_l).name()); @@ -408,7 +408,7 @@ void InstitutionPage::slotNewInstitution(void) emit m_wizard->createInstitution(institution); if(!institution.id().isEmpty()) { - QValueList<MyMoneyInstitution>::const_iterator it_l; + TQValueList<MyMoneyInstitution>::const_iterator it_l; int i = 0; for(it_l = d->m_list.begin(); it_l != d->m_list.end(); ++it_l) { if((*it_l).id() == institution.id()) { @@ -471,12 +471,12 @@ AccountTypePage::AccountTypePage(Wizard* wizard, const char* name) : m_conversionRate->setValue(MyMoneyMoney(1,1)); slotUpdateCurrency(); - connect(m_typeSelection, SIGNAL(itemSelected(int)), this, SLOT(slotUpdateType(int))); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); - connect(m_currencyComboBox, SIGNAL(activated(int)), this, SLOT(slotUpdateCurrency())); - connect(m_conversionRate, SIGNAL(textChanged(const QString&)), this, SLOT(slotUpdateConversionRate(const QString&))); - connect(m_conversionRate, SIGNAL(valueChanged(const QString&)), this, SLOT(slotPriceWarning())); - connect(m_onlineQuote, SIGNAL(clicked()), this, SLOT(slotGetOnlineQuote())); + connect(m_typeSelection, TQT_SIGNAL(itemSelected(int)), this, TQT_SLOT(slotUpdateType(int))); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); + connect(m_currencyComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateCurrency())); + connect(m_conversionRate, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateConversionRate(const TQString&))); + connect(m_conversionRate, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(slotPriceWarning())); + connect(m_onlineQuote, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetOnlineQuote())); } void AccountTypePage::slotUpdateType(int i) @@ -531,9 +531,9 @@ void AccountTypePage::slotUpdateCurrency(void) void AccountTypePage::slotGetOnlineQuote(void) { - QString id = MyMoneyFile::instance()->baseCurrency().id()+" "+m_currencyComboBox->security().id(); + TQString id = MyMoneyFile::instance()->baseCurrency().id()+" "+m_currencyComboBox->security().id(); KEquityPriceUpdateDlg dlg(this, id); - if(dlg.exec() == QDialog::Accepted) { + if(dlg.exec() == TQDialog::Accepted) { MyMoneyPrice price = dlg.price(id); if(price.isValid()) { m_conversionRate->setValue(price.rate(m_currencyComboBox->security().id())); @@ -557,7 +557,7 @@ void AccountTypePage::priceWarning(bool always) m_showPriceWarning = false; } -void AccountTypePage::slotUpdateConversionRate(const QString& txt) +void AccountTypePage::slotUpdateConversionRate(const TQString& txt) { m_conversionExample->setText(i18n("1 %1 equals %2"). arg(MyMoneyFile::instance()->baseCurrency().tradingSymbol()). @@ -566,7 +566,7 @@ void AccountTypePage::slotUpdateConversionRate(const QString& txt) void AccountTypePage::slotLoadWidgets(void) { - m_currencyComboBox->update(QString("x")); + m_currencyComboBox->update(TQString("x")); } bool AccountTypePage::isComplete(void) const @@ -574,13 +574,13 @@ bool AccountTypePage::isComplete(void) const // check that the conversion rate is positive if enabled bool rc = !m_conversionRate->isVisible() || (!m_conversionRate->value().isZero() && !m_conversionRate->value().isNegative()); if(!rc) { - QToolTip::add(m_wizard->m_nextButton, i18n("Conversion rate is not positive")); + TQToolTip::add(m_wizard->m_nextButton, i18n("Conversion rate is not positive")); } else { rc = KMyMoneyWizardPage::isComplete(); if(!rc) { - QToolTip::add(m_wizard->m_nextButton, i18n("No account name supplied")); + TQToolTip::add(m_wizard->m_nextButton, i18n("No account name supplied")); } } hideShowPages(accountType()); @@ -604,7 +604,7 @@ void AccountTypePage::setAccount(const MyMoneyAccount& acc) m_accountName->setText(acc.name()); } -const MyMoneyAccount& AccountTypePage::parentAccount(void) +const MyMoneyAccount& AccountTypePage::tqparentAccount(void) { switch(accountType()) { case MyMoneyAccount::CreditCard: @@ -629,12 +629,12 @@ BrokeragePage::BrokeragePage(Wizard* wizard, const char* name) : KBrokeragePageDecl(wizard), WizardPage<Wizard>(StepBroker, this, wizard, name) { - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); } void BrokeragePage::slotLoadWidgets(void) { - m_brokerageCurrency->update(QString("x")); + m_brokerageCurrency->update(TQString("x")); } void BrokeragePage::enterPage(void) @@ -666,18 +666,18 @@ CreditCardSchedulePage::CreditCardSchedulePage(Wizard* wizard, const char* name) m_mandatoryGroup->add(m_payee); m_mandatoryGroup->add(m_amount->lineedit()); m_mandatoryGroup->add(m_paymentAccount); - connect(m_paymentAccount, SIGNAL(itemSelected(const QString&)), object(), SIGNAL(completeStateChanged())); - connect(m_payee, SIGNAL(itemSelected(const QString&)), object(), SIGNAL(completeStateChanged())); - connect(m_date, SIGNAL(dateChanged(const QDate&)), object(), SIGNAL(completeStateChanged())); + connect(m_paymentAccount, TQT_SIGNAL(itemSelected(const TQString&)), object(), TQT_SIGNAL(completeStateChanged())); + connect(m_payee, TQT_SIGNAL(itemSelected(const TQString&)), object(), TQT_SIGNAL(completeStateChanged())); + connect(m_date, TQT_SIGNAL(dateChanged(const TQDate&)), object(), TQT_SIGNAL(completeStateChanged())); - connect(m_payee, SIGNAL(createItem(const QString&, QString&)), wizard, SIGNAL(createPayee(const QString&, QString&))); + connect(m_payee, TQT_SIGNAL(createItem(const TQString&, TQString&)), wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&))); m_reminderCheckBox->setChecked(true); - connect(m_reminderCheckBox, SIGNAL(toggled(bool)), object(), SIGNAL(completeStateChanged())); + connect(m_reminderCheckBox, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged())); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); - m_method->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHEQUE); + m_method->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHETQUE); #if 0 m_method->insertItem(i18n("Direct debit"), MyMoneySchedule::STYPE_DIRECTDEBIT); m_method->insertItem(i18n("Bank transfer"), MyMoneySchedule::STYPE_BANKTRANSFER); @@ -694,13 +694,13 @@ CreditCardSchedulePage::CreditCardSchedulePage(Wizard* wizard, const char* name) void CreditCardSchedulePage::enterPage(void) { if(m_name->text().isEmpty()) - m_name->setText(i18n("CreditCard %1 monthly payment").arg(m_wizard->m_accountTypePage->m_accountName->text())); + m_name->setText(i18n("CreditCard %1 monthly payment").tqarg(m_wizard->m_accountTypePage->m_accountName->text())); } bool CreditCardSchedulePage::isComplete(void) const { bool rc = true; - QString msg = i18n("Finish entry and create account"); + TQString msg = i18n("Finish entry and create account"); if(m_reminderCheckBox->isChecked()) { msg = i18n("Finish entry and create account and schedule"); if(m_date->date() < m_wizard->m_accountTypePage->m_openingDate->date()) { @@ -724,7 +724,7 @@ bool CreditCardSchedulePage::isComplete(void) const msg = i18n("No name assigned for schedule"); } } - QToolTip::add(m_wizard->m_finishButton, msg); + TQToolTip::add(m_wizard->m_finishButton, msg); return rc; } @@ -760,15 +760,15 @@ GeneralLoanInfoPage::GeneralLoanInfoPage(Wizard* wizard, const char* name) : slotLoadWidgets(); - connect(m_payee, SIGNAL(createItem(const QString&, QString&)), wizard, SIGNAL(createPayee(const QString&, QString&))); - connect(m_anyPayments, SIGNAL(activated(int)), object(), SIGNAL(completeStateChanged())); - connect(m_recordings, SIGNAL(activated(int)), object(), SIGNAL(completeStateChanged())); + connect(m_payee, TQT_SIGNAL(createItem(const TQString&, TQString&)), wizard, TQT_SIGNAL(createPayee(const TQString&, TQString&))); + connect(m_anyPayments, TQT_SIGNAL(activated(int)), object(), TQT_SIGNAL(completeStateChanged())); + connect(m_recordings, TQT_SIGNAL(activated(int)), object(), TQT_SIGNAL(completeStateChanged())); - connect(m_interestType, SIGNAL(activated(int)), object(), SIGNAL(completeStateChanged())); - connect(m_interestChangeDateEdit, SIGNAL(dateChanged(const QDate&)), object(), SIGNAL(completeStateChanged())); - connect(m_openingBalance, SIGNAL(textChanged(const QString&)), object(), SIGNAL(completeStateChanged())); + connect(m_interestType, TQT_SIGNAL(activated(int)), object(), TQT_SIGNAL(completeStateChanged())); + connect(m_interestChangeDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), object(), TQT_SIGNAL(completeStateChanged())); + connect(m_openingBalance, TQT_SIGNAL(textChanged(const TQString&)), object(), TQT_SIGNAL(completeStateChanged())); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); } KMyMoneyWizardPage* GeneralLoanInfoPage::nextPage(void) const @@ -790,7 +790,7 @@ void GeneralLoanInfoPage::enterPage(void) { if(m_firstTime) { // setup default dates to last of this month and one year on top - QDate firstDay(QDate::currentDate().year(), QDate::currentDate().month(), 1); + TQDate firstDay(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), 1); m_firstPaymentDate->setDate(firstDay.addMonths(1).addDays(-1)); m_interestChangeDateEdit->setDate(m_firstPaymentDate->date().addYears(1));; m_firstTime = false; @@ -802,7 +802,7 @@ bool GeneralLoanInfoPage::isComplete(void) const m_wizard->setStepHidden(StepPayout, !m_wizard->openingBalance().isZero()); bool rc = KMyMoneyWizardPage::isComplete(); if(!rc) { - QToolTip::add(m_wizard->m_nextButton, i18n("No payee supplied")); + TQToolTip::add(m_wizard->m_nextButton, i18n("No payee supplied")); } // fixup availability of items on this page @@ -816,19 +816,19 @@ bool GeneralLoanInfoPage::isComplete(void) const if(m_openingBalance->isEnabled() && m_openingBalance->lineedit()->text().length() == 0) { rc = false; - QToolTip::add(m_wizard->m_nextButton, i18n("No opening balance supplied")); + TQToolTip::add(m_wizard->m_nextButton, i18n("No opening balance supplied")); } if(rc && (m_interestType->currentItem() != 0) && (m_interestChangeDateEdit->date() <= m_firstPaymentDate->date())) { rc = false; - QToolTip::add(m_wizard->m_nextButton, i18n("An interest change can only happen after the first payment")); + TQToolTip::add(m_wizard->m_nextButton, i18n("An interest change can only happen after the first payment")); } return rc; } -const MyMoneyAccount& GeneralLoanInfoPage::parentAccount(void) +const MyMoneyAccount& GeneralLoanInfoPage::tqparentAccount(void) { return ( m_loanDirection->currentItem() == 0 ) ? MyMoneyFile::instance()->liability() @@ -850,16 +850,16 @@ LoanDetailsPage::LoanDetailsPage(Wizard* wizard, const char* name) : // allow any precision for the interest rate m_interestRate->setPrecision(-1); - connect(m_paymentDue, SIGNAL(activated(int)), this, SLOT(slotValuesChanged())); + connect(m_paymentDue, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValuesChanged())); - connect(m_termAmount, SIGNAL(valueChanged(int)), this, SLOT(slotValuesChanged())); - connect(m_termUnit, SIGNAL(highlighted(int)), this, SLOT(slotValuesChanged())); - connect(m_loanAmount, SIGNAL(textChanged(const QString&)), this, SLOT(slotValuesChanged())); - connect(m_interestRate, SIGNAL(textChanged(const QString&)), this, SLOT(slotValuesChanged())); - connect(m_paymentAmount, SIGNAL(textChanged(const QString&)), this, SLOT(slotValuesChanged())); - connect(m_balloonAmount, SIGNAL(textChanged(const QString&)), this, SLOT(slotValuesChanged())); + connect(m_termAmount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValuesChanged())); + connect(m_termUnit, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotValuesChanged())); + connect(m_loanAmount, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged())); + connect(m_interestRate, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged())); + connect(m_paymentAmount, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged())); + connect(m_balloonAmount, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValuesChanged())); - connect(m_calculateButton, SIGNAL(clicked()), this, SLOT(slotCalculate())); + connect(m_calculateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCalculate())); } void LoanDetailsPage::enterPage(void) @@ -903,7 +903,7 @@ void LoanDetailsPage::slotCalculate(void) MyMoneyFinancialCalculator calc; long double val; int PF, CF; - QString result; + TQString result; bool moneyBorrowed = m_wizard->moneyBorrowed(); bool moneyLend = !moneyBorrowed; @@ -959,14 +959,14 @@ void LoanDetailsPage::slotCalculate(void) val = calc.presentValue(); m_loanAmount->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", m_wizard->precision())); result = i18n("KMyMoney has calculated the amount of the loan as %1.") - .arg(m_loanAmount->lineedit()->text()); + .tqarg(m_loanAmount->lineedit()->text()); } else if(m_interestRate->lineedit()->text().isEmpty()) { // calculate the interest rate out of the other information val = calc.interestRate(); m_interestRate->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", 3)); result = i18n("KMyMoney has calculated the interest rate to %1%.") - .arg(m_interestRate->lineedit()->text()); + .tqarg(m_interestRate->lineedit()->text()); } else if(m_paymentAmount->lineedit()->text().isEmpty()) { // calculate the periodical amount of the payment out of the other information @@ -979,7 +979,7 @@ void LoanDetailsPage::slotCalculate(void) calc.setPmt(val); result = i18n("KMyMoney has calculated a periodic payment of %1 to cover principal and interest.") - .arg(m_paymentAmount->lineedit()->text()); + .tqarg(m_paymentAmount->lineedit()->text()); val = calc.futureValue(); if((moneyBorrowed && val < 0 && fabsl(val) >= fabsl(calc.payment())) @@ -989,9 +989,9 @@ void LoanDetailsPage::slotCalculate(void) val = calc.futureValue(); MyMoneyMoney refVal(static_cast<double>(val)); m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision())); - result += QString(" "); + result += TQString(" "); result += i18n("The number of payments has been decremented and the balloon payment has been modified to %1.") - .arg(m_balloonAmount->lineedit()->text()); + .tqarg(m_balloonAmount->lineedit()->text()); } else if((moneyBorrowed && val < 0 && fabsl(val) < fabsl(calc.payment())) || (moneyLend && val > 0 && fabs(val) < fabs(calc.payment()))) { m_balloonAmount->loadText(MyMoneyMoney(0,1).formatMoney("", m_wizard->precision())); @@ -999,7 +999,7 @@ void LoanDetailsPage::slotCalculate(void) MyMoneyMoney refVal(static_cast<double>(val)); m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision())); result += i18n("The balloon payment has been modified to %1.") - .arg(m_balloonAmount->lineedit()->text()); + .tqarg(m_balloonAmount->lineedit()->text()); } } else if(m_termAmount->value() == 0) { @@ -1011,7 +1011,7 @@ void LoanDetailsPage::slotCalculate(void) // if the number of payments has a fractional part, then we // round it to the smallest integer and calculate the balloon payment result = i18n("KMyMoney has calculated the term of your loan as %1. ") - .arg(updateTermWidgets(floorl(val))); + .tqarg(updateTermWidgets(floorl(val))); if(val != floorl(val)) { calc.setNpp(floorl(val)); @@ -1019,7 +1019,7 @@ void LoanDetailsPage::slotCalculate(void) MyMoneyMoney refVal(static_cast<double>(val)); m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision())); result += i18n("The balloon payment has been modified to %1.") - .arg(m_balloonAmount->lineedit()->text()); + .tqarg(m_balloonAmount->lineedit()->text()); } } else { @@ -1050,7 +1050,7 @@ void LoanDetailsPage::slotCalculate(void) MyMoneyMoney refVal(static_cast<double>(val)); result = i18n("KMyMoney has calculated a balloon payment of %1 for this loan.") - .arg(refVal.abs().formatMoney("", m_wizard->precision())); + .tqarg(refVal.abs().formatMoney("", m_wizard->precision())); if(!m_balloonAmount->lineedit()->text().isEmpty()) { if((m_balloonAmount->value().abs() - refVal.abs()).abs().toDouble() > 1) { @@ -1111,11 +1111,11 @@ int LoanDetailsPage::term(void) const return factor; } -QString LoanDetailsPage::updateTermWidgets(const long double val) +TQString LoanDetailsPage::updateTermWidgets(const long double val) { long long vl = static_cast<long long>(floorl(val)); - QString valString; + TQString valString; MyMoneySchedule::occurenceE unit = m_termUnit->currentItem(); if((unit == MyMoneySchedule::OCCUR_MONTHLY) @@ -1147,7 +1147,7 @@ bool LoanDetailsPage::isComplete(void) const // bool rc = KMyMoneyWizardPage::isComplete(); int fieldCnt = 0; - QWidget* calculatedField = 0; + TQWidget* calculatedField = 0; if(m_loanAmount->lineedit()->text().length() > 0) { fieldCnt++; @@ -1187,11 +1187,11 @@ bool LoanDetailsPage::isComplete(void) const m_calculateButton->setAutoDefault(false); m_calculateButton->setDefault(false); if(m_needCalculate && fieldCnt == 4) { - QToolTip::add(m_wizard->m_nextButton, i18n("Press Calculate to verify the values")); + TQToolTip::add(m_wizard->m_nextButton, i18n("Press Calculate to verify the values")); m_calculateButton->setAutoDefault(true); m_calculateButton->setDefault(true); } else if(fieldCnt != 5) { - QToolTip::add(m_wizard->m_nextButton, i18n("Not all details supplied")); + TQToolTip::add(m_wizard->m_nextButton, i18n("Not all details supplied")); m_calculateButton->setAutoDefault(true); m_calculateButton->setDefault(true); } @@ -1221,7 +1221,7 @@ LoanPaymentPage::LoanPaymentPage(Wizard* wizard, const char* name) : WizardPage<Wizard>(StepFees, this, wizard, name), d(new Private) { - d->phonyAccount = MyMoneyAccount(QString("Phony-ID"), MyMoneyAccount()); + d->phonyAccount = MyMoneyAccount(TQString("Phony-ID"), MyMoneyAccount()); d->phonySplit.setAccountId(d->phonyAccount.id()); d->phonySplit.setValue(0); @@ -1229,7 +1229,7 @@ LoanPaymentPage::LoanPaymentPage(Wizard* wizard, const char* name) : d->additionalFeesTransaction.addSplit(d->phonySplit); - connect(m_additionalFeesButton, SIGNAL(clicked()), this, SLOT(slotAdditionalFees())); + connect(m_additionalFeesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdditionalFees())); } LoanPaymentPage::~LoanPaymentPage() @@ -1247,11 +1247,11 @@ MyMoneyMoney LoanPaymentPage::additionalFees(void) const return d->additionalFees; } -void LoanPaymentPage::additionalFeesSplits(QValueList<MyMoneySplit>& list) +void LoanPaymentPage::additionalFeesSplits(TQValueList<MyMoneySplit>& list) { list.clear(); - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit>::ConstIterator it; for(it = d->additionalFeesTransaction.splits().begin(); it != d->additionalFeesTransaction.splits().end(); ++it) { if((*it).accountId() != d->phonyAccount.id()) { list << (*it); @@ -1278,15 +1278,15 @@ void LoanPaymentPage::enterPage(void) void LoanPaymentPage::slotAdditionalFees(void) { - QMap<QString, MyMoneyMoney> priceInfo; + TQMap<TQString, MyMoneyMoney> priceInfo; KSplitTransactionDlg* dlg = new KSplitTransactionDlg(d->additionalFeesTransaction, d->phonySplit, d->phonyAccount, false, !m_wizard->moneyBorrowed(), MyMoneyMoney(0), priceInfo); - // connect(dlg, SIGNAL(newCategory(MyMoneyAccount&)), this, SIGNAL(newCategory(MyMoneyAccount&))); + // connect(dlg, TQT_SIGNAL(newCategory(MyMoneyAccount&)), this, TQT_SIGNAL(newCategory(MyMoneyAccount&))); - if(dlg->exec() == QDialog::Accepted) { + if(dlg->exec() == TQDialog::Accepted) { d->additionalFeesTransaction = dlg->transaction(); // sum up the additional fees - QValueList<MyMoneySplit>::ConstIterator it; + TQValueList<MyMoneySplit>::ConstIterator it; d->additionalFees = MyMoneyMoney(0); for(it = d->additionalFeesTransaction.splits().begin(); it != d->additionalFeesTransaction.splits().end(); ++it) { @@ -1312,27 +1312,27 @@ LoanSchedulePage::LoanSchedulePage(Wizard* wizard, const char* name) : { m_mandatoryGroup->add(m_interestCategory->lineEdit()); m_mandatoryGroup->add(m_paymentAccount->lineEdit()); - connect(m_interestCategory, SIGNAL(createItem(const QString&, QString&)), this, SLOT(slotCreateCategory(const QString&, QString&))); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); + connect(m_interestCategory, TQT_SIGNAL(createItem(const TQString&, TQString&)), this, TQT_SLOT(slotCreateCategory(const TQString&, TQString&))); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); } -void LoanSchedulePage::slotCreateCategory(const QString& name, QString& id) +void LoanSchedulePage::slotCreateCategory(const TQString& name, TQString& id) { - MyMoneyAccount acc, parent; + MyMoneyAccount acc, tqparent; acc.setName(name); if(m_wizard->moneyBorrowed()) - parent = MyMoneyFile::instance()->expense(); + tqparent = MyMoneyFile::instance()->expense(); else - parent = MyMoneyFile::instance()->income(); + tqparent = MyMoneyFile::instance()->income(); - emit m_wizard->createCategory(acc, parent); + emit m_wizard->createCategory(acc, tqparent); // return id id = acc.id(); } -QDate LoanSchedulePage::firstPaymentDueDate(void) const +TQDate LoanSchedulePage::firstPaymentDueDate(void) const { if(m_firstPaymentDueDate->isEnabled()) return m_firstPaymentDueDate->date(); @@ -1379,18 +1379,18 @@ LoanPayoutPage::LoanPayoutPage(Wizard* wizard, const char* name) : KIconLoader* il = KGlobal::iconLoader(); KGuiItem createAssetButtenItem( i18n( "&Create..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new asset account"), i18n("If the asset account does not yet exist, press this button to create it.")); m_createAssetButton->setGuiItem(createAssetButtenItem); - QToolTip::add(m_createAssetButton, createAssetButtenItem.toolTip()); - QWhatsThis::add(m_createAssetButton, createAssetButtenItem.whatsThis()); - connect(m_createAssetButton, SIGNAL(clicked()), this, SLOT(slotCreateAssetAccount())); + TQToolTip::add(m_createAssetButton, createAssetButtenItem.toolTip()); + TQWhatsThis::add(m_createAssetButton, createAssetButtenItem.whatsThis()); + connect(m_createAssetButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateAssetAccount())); - connect(m_noPayoutTransaction, SIGNAL(toggled(bool)), this, SLOT(slotButtonsToggled())); - connect(m_refinanceLoan, SIGNAL(toggled(bool)), this, SLOT(slotButtonsToggled())); + connect(m_noPayoutTransaction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsToggled())); + connect(m_refinanceLoan, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsToggled())); - connect(MyMoneyFile::instance(), SIGNAL(dataChanged()), this, SLOT(slotLoadWidgets())); + connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); slotLoadWidgets(); } @@ -1400,7 +1400,7 @@ void LoanPayoutPage::slotButtonsToggled(void) // not defined. Using a single shot timer postpones the call of m_mandatoryGroup::changed() // until the next round of the main loop so we can be sure to see all relevant changes // that happened in the meantime (eg. widgets are enabled and disabled) - QTimer::singleShot(0, m_mandatoryGroup, SLOT(changed())); + TQTimer::singleShot(0, m_mandatoryGroup, TQT_SLOT(changed())); } void LoanPayoutPage::slotCreateAssetAccount(void) @@ -1448,7 +1448,7 @@ bool LoanPayoutPage::isComplete(void) const return KMyMoneyWizardPage::isComplete() | m_noPayoutTransaction->isChecked(); } -const QString& LoanPayoutPage::payoutAccountId(void) const +const TQString& LoanPayoutPage::payoutAccountId(void) const { if(m_refinanceLoan->isChecked()) { return m_loanAccount->selectedItem(); @@ -1472,9 +1472,9 @@ HierarchyPage::HierarchyPage(Wizard* wizard, const char* name) : m_qlistviewParentAccounts->addColumn("Accounts"); m_qlistviewParentAccounts->setMultiSelection(false); m_qlistviewParentAccounts->header()->setResizeEnabled(true); - m_qlistviewParentAccounts->setColumnWidthMode(0, QListView::Maximum); + m_qlistviewParentAccounts->setColumnWidthMode(0, TQListView::Maximum); // never show the horizontal scroll bar - // m_qlistviewParentAccounts->setHScrollBarMode(QScrollView::AlwaysOff); + // m_qlistviewParentAccounts->setHScrollBarMode(TQScrollView::AlwaysOff); } void HierarchyPage::enterPage(void) @@ -1483,7 +1483,7 @@ void HierarchyPage::enterPage(void) // - if the type has changed // - - clear the list // - - populate the account list (also occurs first time we come here) - MyMoneyAccount topAccount = m_wizard->m_accountTypePage->parentAccount(); + MyMoneyAccount topAccount = m_wizard->m_accountTypePage->tqparentAccount(); // If the list was not populated with this top account we populate it now if ( &m_topAccount == NULL || m_topAccount.id() != topAccount.id()) @@ -1504,17 +1504,17 @@ void HierarchyPage::enterPage(void) } KMyMoneyAccountTreeItem* HierarchyPage::buildAccountTree - ( KMyMoneyAccountTreeBase* parent + ( KMyMoneyAccountTreeBase* tqparent , const MyMoneyAccount& account , bool open ) const { // Recursively add child accounts to the list if ( account.accountType() == MyMoneyAccount::Investment) return NULL; - KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( parent, account ); + KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( tqparent, account ); if ( open ) childItem->setOpen(true); - for ( QStringList::ConstIterator it = account.accountList().begin(); + for ( TQStringList::ConstIterator it = account.accountList().begin(); it != account.accountList().end(); ++it ) { @@ -1529,17 +1529,17 @@ KMyMoneyAccountTreeItem* HierarchyPage::buildAccountTree } KMyMoneyAccountTreeItem* HierarchyPage::buildAccountTree - ( KMyMoneyAccountTreeItem* parent + ( KMyMoneyAccountTreeItem* tqparent , const MyMoneyAccount& account , bool open ) const { // Recursively add child accounts to the list if ( account.accountType() == MyMoneyAccount::Investment) return NULL; - KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( parent, account ); + KMyMoneyAccountTreeItem* childItem = new KMyMoneyAccountTreeItem( tqparent, account ); if ( open ) childItem->setOpen(true); - for ( QStringList::ConstIterator it = account.accountList().begin(); + for ( TQStringList::ConstIterator it = account.accountList().begin(); it != account.accountList().end(); ++it ) { @@ -1558,7 +1558,7 @@ KMyMoneyWizardPage* HierarchyPage::nextPage(void) const return m_wizard->m_accountSummaryPage; } -const MyMoneyAccount& HierarchyPage::parentAccount(void) +const MyMoneyAccount& HierarchyPage::tqparentAccount(void) { // TODO // Instead of returning the Parent Account we can simply @@ -1573,8 +1573,8 @@ AccountSummaryPage::AccountSummaryPage(Wizard* wizard, const char* name) : WizardPage<Wizard>(StepFinish, this, wizard, name) { m_dataList->setSorting(-1); - m_dataList->setColumnWidthMode(1, QListView::Maximum); - m_dataList->setResizeMode(QListView::LastColumn); + m_dataList->setColumnWidthMode(1, TQListView::Maximum); + m_dataList->setResizeMode(TQListView::LastColumn); } void AccountSummaryPage::enterPage(void) @@ -1585,7 +1585,7 @@ void AccountSummaryPage::enterPage(void) // assign an id to the account inside the wizard which is required for a schedule // get the schedule and clear the id again in the wizards object. - MyMoneyAccount tmp(QString("Phony-ID"), acc); + MyMoneyAccount tmp(TQString("Phony-ID"), acc); m_wizard->setAccount(tmp); MyMoneySchedule sch = m_wizard->schedule(); m_wizard->setAccount(acc); @@ -1593,13 +1593,13 @@ void AccountSummaryPage::enterPage(void) m_dataList->clear(); // Account data - QListViewItem* group = new KMyMoneyCheckListItem(m_dataList, i18n("Account information"), QString(), QString(), QCheckListItem::RadioButtonController); + TQListViewItem* group = new KMyMoneyCheckListItem(m_dataList, i18n("Account information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); - QListViewItem* p; + TQListViewItem* p; p = new KListViewItem(group, i18n("Name"), acc.name()); if(!acc.isLoan()) p = new KListViewItem(group, p, i18n("Subaccount of"), - m_wizard->parentAccount().name()); + m_wizard->tqparentAccount().name()); if(acc.accountType() == MyMoneyAccount::AssetLoan) p = new KListViewItem(group, p, i18n("Type"), i18n("Loan")); else @@ -1607,7 +1607,7 @@ void AccountSummaryPage::enterPage(void) p = new KListViewItem(group, p, i18n("Currency"), m_wizard->currency().name()); p = new KListViewItem(group, p, i18n("Opening date"), KGlobal::locale()->formatDate(acc.openingDate())); if(m_wizard->currency().id() != MyMoneyFile::instance()->baseCurrency().id()) { - p = new KListViewItem(group, p, i18n("Conversion rate"), m_wizard->conversionRate().rate(QString()).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())); + p = new KListViewItem(group, p, i18n("Conversion rate"), m_wizard->conversionRate().rate(TQString()).formatMoney("", KMyMoneyGlobalSettings::pricePrecision())); } if(!acc.isLoan() || !m_wizard->openingBalance().isZero()) p = new KListViewItem(group, p, i18n("Opening balance"), m_wizard->openingBalance().formatMoney(acc, sec)); @@ -1624,9 +1624,9 @@ void AccountSummaryPage::enterPage(void) if(acc.accountType() == MyMoneyAccount::Investment) { if(m_wizard->m_brokeragepage->m_createBrokerageButton->isChecked()) { - group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Brokerage Account"), QString(), QString(), QCheckListItem::RadioButtonController); + group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Brokerage Account"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); - p = new KListViewItem(group, p, i18n("Name"), QString("%1 (Brokerage)").arg(acc.name())); + p = new KListViewItem(group, p, i18n("Name"), TQString("%1 (Brokerage)").tqarg(acc.name())); p = new KListViewItem(group, p, i18n("Currency"), m_wizard->m_brokeragepage->m_brokerageCurrency->security().name()); if(m_wizard->m_brokeragepage->m_accountNumber->isEnabled() && !m_wizard->m_brokeragepage->m_accountNumber->text().isEmpty()) p = new KListViewItem(group, p, i18n("Number"), m_wizard->m_brokeragepage->m_accountNumber->text()); @@ -1637,14 +1637,14 @@ void AccountSummaryPage::enterPage(void) // Loan if(acc.isLoan()) { - group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Loan information"), QString(), QString(), QCheckListItem::RadioButtonController); + group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Loan information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); if(m_wizard->moneyBorrowed()) { p = new KListViewItem(group, p, i18n("Amount borrowed"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision())); } else { p = new KListViewItem(group, p, i18n("Amount lent"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision())); } - p = new KListViewItem(group, p, i18n("Interest rate"), QString("%1 %").arg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1))); + p = new KListViewItem(group, p, i18n("Interest rate"), TQString("%1 %").tqarg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1))); p = new KListViewItem(group, p, i18n("Interest rate is"), m_wizard->m_generalLoanInfoPage->m_interestType->currentText()); p = new KListViewItem(group, p, i18n("Principal and interest"), m_wizard->m_loanDetailsPage->m_paymentAmount->value().formatMoney(acc, sec)); p = new KListViewItem(group, p, i18n("Additional fees"), m_wizard->m_loanPaymentPage->additionalFees().formatMoney(acc, sec)); @@ -1652,7 +1652,7 @@ void AccountSummaryPage::enterPage(void) p = new KListViewItem(group, p, i18n("Payment account"), m_wizard->m_loanSchedulePage->m_paymentAccount->currentText()); if(!m_wizard->m_loanPayoutPage->m_noPayoutTransaction->isChecked() && m_wizard->openingBalance().isZero()) { - group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Payout information"), QString(), QString(), QCheckListItem::RadioButtonController); + group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Payout information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); if(m_wizard->m_loanPayoutPage->m_refinanceLoan->isChecked()) { p = new KListViewItem(group, p, i18n("Refinance"), m_wizard->m_loanPayoutPage->m_loanAccount->currentText()); @@ -1668,7 +1668,7 @@ void AccountSummaryPage::enterPage(void) // Schedule if(!(sch == MyMoneySchedule())) { - group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Schedule information"), QString(), QString(), QCheckListItem::RadioButtonController); + group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Schedule information"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); p = new KListViewItem(group, i18n("Name"), sch.name()); if(acc.accountType() == MyMoneyAccount::CreditCard) { diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h index c8a149c..69e8aa7 100644 --- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h +++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QString; +class TQString; // ---------------------------------------------------------------------------- // Project Includes @@ -67,8 +67,9 @@ class Wizard : public KMyMoneyWizard friend class AccountSummaryPage; Q_OBJECT + TQ_OBJECT public: - Wizard(QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); + Wizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); /** * Returns the information about the account as entered by @@ -82,12 +83,12 @@ public: void setAccount(const MyMoneyAccount& acc); /** - * Returns the information about the parent account as entered by + * Returns the information about the tqparent account as entered by * the user. * @note For now it's either fixed as Asset or Liability. We will provide - * user selected parent accounts later. + * user selected tqparent accounts later. */ - const MyMoneyAccount& parentAccount(void); + const MyMoneyAccount& tqparentAccount(void); /** * Returns information about the schedule. If the returned value diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h b/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h index b8a7cb1..18af5f2 100644 --- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h +++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard_p.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qcheckbox.h> +#include <tqcheckbox.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -62,12 +62,13 @@ namespace NewAccountWizard { class InstitutionPage : public KInstitutionPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - InstitutionPage(Wizard* parent, const char* name = 0); + InstitutionPage(Wizard* tqparent, const char* name = 0); ~InstitutionPage(); KMyMoneyWizardPage* nextPage(void) const; - QWidget* initialFocusWidget(void) const { return m_institutionComboBox; } + TQWidget* initialFocusWidget(void) const { return m_institutionComboBox; } /** * Returns the information about an institution if entered by @@ -91,15 +92,16 @@ private: class AccountTypePage : public KAccountTypePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - AccountTypePage(Wizard* parent, const char* name = 0); + AccountTypePage(Wizard* tqparent, const char* name = 0); virtual bool isComplete(void) const; KMyMoneyWizardPage* nextPage(void) const; - QWidget* initialFocusWidget(void) const { return m_accountName; } + TQWidget* initialFocusWidget(void) const { return m_accountName; } MyMoneyAccount::accountTypeE accountType(void) const; - const MyMoneyAccount& parentAccount(void); + const MyMoneyAccount& tqparentAccount(void); bool allowsParentAccount(void) const; const MyMoneySecurity& currency(void) const; @@ -113,7 +115,7 @@ private slots: void slotLoadWidgets(void); void slotUpdateType(int i); void slotUpdateCurrency(void); - void slotUpdateConversionRate(const QString&); + void slotUpdateConversionRate(const TQString&); void slotGetOnlineQuote(void); void slotPriceWarning(void); @@ -124,12 +126,13 @@ private: class BrokeragePage : public KBrokeragePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - BrokeragePage(Wizard* parent, const char* name = 0); + BrokeragePage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; void enterPage(void); - QWidget* initialFocusWidget(void) const { return m_createBrokerageButton; } + TQWidget* initialFocusWidget(void) const { return m_createBrokerageButton; } private slots: void slotLoadWidgets(void); @@ -138,13 +141,14 @@ private slots: class CreditCardSchedulePage : public KSchedulePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - CreditCardSchedulePage(Wizard* parent, const char* name = 0); + CreditCardSchedulePage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; virtual bool isComplete(void) const; void enterPage(void); - QWidget* initialFocusWidget(void) const { return m_reminderCheckBox; } + TQWidget* initialFocusWidget(void) const { return m_reminderCheckBox; } private slots: void slotLoadWidgets(void); @@ -153,14 +157,15 @@ private slots: class GeneralLoanInfoPage : public KGeneralLoanInfoPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - GeneralLoanInfoPage(Wizard* parent, const char* name = 0); + GeneralLoanInfoPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; virtual bool isComplete(void) const; void enterPage(void); - const MyMoneyAccount& parentAccount(void); + const MyMoneyAccount& tqparentAccount(void); - QWidget* initialFocusWidget(void) const { return m_loanDirection; } + TQWidget* initialFocusWidget(void) const { return m_loanDirection; } /** * Returns @p true if the user decided to record all payments, @p false otherwise. @@ -177,13 +182,14 @@ private: class LoanDetailsPage : public KLoanDetailsPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - LoanDetailsPage(Wizard* parent, const char* name = 0); + LoanDetailsPage(Wizard* tqparent, const char* name = 0); void enterPage(void); KMyMoneyWizardPage* nextPage(void) const; virtual bool isComplete(void) const; - QWidget* initialFocusWidget(void) const { return m_paymentDue; } + TQWidget* initialFocusWidget(void) const { return m_paymentDue; } /** * This method returns the number of payments depending on @@ -197,7 +203,7 @@ private: * according to the length of the given @a term. * The term is also converted into a string and returned. */ - QString updateTermWidgets(const long double term); + TQString updateTermWidgets(const long double term); private: bool m_needCalculate; @@ -210,8 +216,9 @@ private slots: class LoanPaymentPage : public KLoanPaymentPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - LoanPaymentPage(Wizard* parent, const char* name = 0); + LoanPaymentPage(Wizard* tqparent, const char* name = 0); ~LoanPaymentPage(); KMyMoneyWizardPage* nextPage(void) const; @@ -233,7 +240,7 @@ public: * @note The splits may contain assigned ids which the caller must remove before * adding the splits to a MyMoneyTransaction object. */ - void additionalFeesSplits(QValueList<MyMoneySplit>& list); + void additionalFeesSplits(TQValueList<MyMoneySplit>& list); protected slots: void slotAdditionalFees(void); @@ -251,8 +258,9 @@ private: class LoanSchedulePage : public KLoanSchedulePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - LoanSchedulePage(Wizard* parent, const char* name = 0); + LoanSchedulePage(Wizard* tqparent, const char* name = 0); void enterPage(void); KMyMoneyWizardPage* nextPage(void) const; @@ -260,29 +268,30 @@ public: /** * This method returns the due date of the first payment to be recorded. */ - QDate firstPaymentDueDate(void) const; + TQDate firstPaymentDueDate(void) const; - QWidget* initialFocusWidget(void) const { return m_interestCategory; } + TQWidget* initialFocusWidget(void) const { return m_interestCategory; } private slots: void slotLoadWidgets(void); - void slotCreateCategory(const QString& name, QString& id); + void slotCreateCategory(const TQString& name, TQString& id); }; class LoanPayoutPage : public KLoanPayoutPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - LoanPayoutPage(Wizard* parent, const char* name = 0); + LoanPayoutPage(Wizard* tqparent, const char* name = 0); void enterPage(void); virtual bool isComplete(void) const; KMyMoneyWizardPage* nextPage(void) const; - QWidget* initialFocusWidget(void) const { return m_noPayoutTransaction; } + TQWidget* initialFocusWidget(void) const { return m_noPayoutTransaction; } - const QString& payoutAccountId(void) const; + const TQString& payoutAccountId(void) const; private slots: void slotLoadWidgets(void); @@ -293,20 +302,21 @@ private slots: class HierarchyPage : public KHierarchyPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - HierarchyPage(Wizard* parent, const char* name = 0); + HierarchyPage(Wizard* tqparent, const char* name = 0); void enterPage(void); KMyMoneyWizardPage* nextPage(void) const; - QWidget* initialFocusWidget(void) const { return m_qlistviewParentAccounts; } - const MyMoneyAccount& parentAccount(void); + TQWidget* initialFocusWidget(void) const { return m_qlistviewParentAccounts; } + const MyMoneyAccount& tqparentAccount(void); private: KMyMoneyAccountTreeItem* buildAccountTree - ( KMyMoneyAccountTreeBase* parent + ( KMyMoneyAccountTreeBase* tqparent , const MyMoneyAccount& account , bool open = false ) const; KMyMoneyAccountTreeItem* buildAccountTree - ( KMyMoneyAccountTreeItem* parent + ( KMyMoneyAccountTreeItem* tqparent , const MyMoneyAccount& account , bool open = false ) const; MyMoneyAccount m_topAccount; // Last populated top account @@ -316,10 +326,11 @@ private: class AccountSummaryPage : public KAccountSummaryPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - AccountSummaryPage(Wizard* parent, const char* name = 0); + AccountSummaryPage(Wizard* tqparent, const char* name = 0); void enterPage(void); - QWidget* initialFocusWidget(void) const { return m_dataList; } + TQWidget* initialFocusWidget(void) const { return m_dataList; } }; } // namespace diff --git a/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui index fd4f886..180daca 100644 --- a/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSchedulePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSchedulePageDecl</cstring> </property> @@ -24,7 +24,7 @@ <string>For credit card accounts you can create a monthly schedule which will automatically remind you about the payment. Please fill in the details about this payment here.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_reminderCheckBox</cstring> </property> @@ -35,7 +35,7 @@ <string>Yes, remind me when the payment is due</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_paymentFrame</cstring> </property> @@ -52,7 +52,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -64,7 +64,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>180</width> <height>0</height> @@ -74,12 +74,12 @@ <string>Name of schedule</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_name</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -92,7 +92,7 @@ <cstring>m_payee</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -108,7 +108,7 @@ <enum>StrongFocus</enum> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4_3</cstring> </property> @@ -124,7 +124,7 @@ <enum>StrongFocus</enum> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> @@ -132,7 +132,7 @@ <string>Payment should be made from account</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -141,7 +141,7 @@ from account</string> <cstring>m_paymentAccount</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -166,7 +166,7 @@ from account</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -183,5 +183,10 @@ from account</string> <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneycategory.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui index e0e3620..9d76f0d 100644 --- a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KAccountPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KAccountPageDecl</cstring> </property> @@ -27,7 +27,7 @@ <string>A typical KMyMoney user maintains a checking a account with some institution and uses it to receive money or pay bills. If this is not the case, please deselect the checkbox below and continue on the next page.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_haveCheckingAccountButton</cstring> </property> @@ -35,7 +35,7 @@ <string>I have a checking account that I want to manage with KMyMoney</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_accountDataFrame</cstring> </property> @@ -68,7 +68,7 @@ <string>Each institution has a routing number. Enter it here. If uncertain, leave the field blank. You can modify it later.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -76,7 +76,7 @@ <string>Name of the institution</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -100,7 +100,7 @@ <string>Enter a descriptive name that will be used by KMyMoney to identify your checking account.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -108,9 +108,9 @@ <string>Opening date</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -143,7 +143,7 @@ </spacer> </hbox> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -151,7 +151,7 @@ <string>Number of the account</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -159,7 +159,7 @@ <string>Name of the account</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -167,15 +167,15 @@ <string>Opening balance</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="1"> + <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_accountCurrencyLabel</cstring> </property> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -264,5 +264,9 @@ <tabstop>kActiveLabel2</tabstop> <tabstop>kActiveLabel1</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kmymoney/kmymoneydateinput.h</include> + <include location="global" impldecl="in implementation">kmymoney/kmymoneyedit.h</include> +</includes> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui index 579bf1e..8705796 100644 --- a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCurrencyPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCurrencyPageDecl</cstring> </property> @@ -27,9 +27,9 @@ <string>KMyMoney supports multiple currencies. Your reports will be based on a default curreny which you can select here. The default for new accounts is also the currency you select here.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>21</height> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>21</height> @@ -78,5 +78,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui index dcae784..527c6eb 100644 --- a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KFilePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFilePageDecl</cstring> </property> @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -82,5 +82,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui index 916493d..d1aa51d 100644 --- a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KGeneralPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KGeneralPageDecl</cstring> </property> @@ -26,19 +26,19 @@ This information will be seen and used only by you. The information is used to personalize KMyMoney, to encrypt your file, etc.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame8</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>25</width> <height>0</height> @@ -51,27 +51,27 @@ This information will be seen and used only by you. The information is used to p <enum>Plain</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -81,26 +81,26 @@ This information will be seen and used only by you. The information is used to p <string>County/State:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_userNameEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_countyEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>m_townEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -110,16 +110,16 @@ This information will be seen and used only by you. The information is used to p <string>Street:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_streetEdit</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> @@ -129,7 +129,7 @@ This information will be seen and used only by you. The information is used to p <string>Email:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -137,11 +137,11 @@ This information will be seen and used only by you. The information is used to p <string>Your name:</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> @@ -151,11 +151,11 @@ This information will be seen and used only by you. The information is used to p <string>Telephone:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -165,16 +165,16 @@ This information will be seen and used only by you. The information is used to p <string>Town:</string> </property> </widget> - <widget class="QLineEdit" row="6" column="1"> + <widget class="TQLineEdit" row="6" column="1"> <property name="name"> <cstring>m_emailEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -184,21 +184,21 @@ This information will be seen and used only by you. The information is used to p <string>Zip code</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>m_telephoneEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>m_zipcodeEdit</cstring> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -222,7 +222,7 @@ This information will be seen and used only by you. The information is used to p <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>20</height> @@ -233,11 +233,11 @@ This information will be seen and used only by you. The information is used to p </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame8_2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>25</width> <height>0</height> @@ -254,5 +254,5 @@ This information will be seen and used only by you. The information is used to p </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui index d9dd326..b0bed68 100644 --- a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KIntroPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KIntroPageDecl</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -29,7 +29,7 @@ <property name="text"> <string>Welcome to KMyMoney!</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -53,7 +53,7 @@ On the next few pages you will be guided through the steps necessary to setup th <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>41</height> @@ -62,5 +62,5 @@ On the next few pages you will be guided through the steps necessary to setup th </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp index 608afb6..d8607fc 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp @@ -20,12 +20,12 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <qpixmap.h> -#include <qbitmap.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qlabel.h> +#include <tqpixmap.h> +#include <tqbitmap.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqdir.h> +#include <tqlabel.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -68,8 +68,8 @@ using namespace NewUserWizard; static int stepCount; -NewUserWizard::Wizard::Wizard(QWidget *parent, const char *name, bool modal, WFlags flags) : - KMyMoneyWizard(parent, name, modal, flags), +NewUserWizard::Wizard::Wizard(TQWidget *tqparent, const char *name, bool modal, WFlags flags) : + KMyMoneyWizard(tqparent, name, modal, flags), m_introPage(0) { bool isFirstTime = KMyMoneyGlobalSettings::firstTimeRun(); @@ -108,7 +108,7 @@ MyMoneyPayee NewUserWizard::Wizard::user(void) const return m_generalPage->user(); } -QString NewUserWizard::Wizard::url(void) const +TQString NewUserWizard::Wizard::url(void) const { return m_filePage->m_dataFileEdit->url(); } @@ -150,7 +150,7 @@ MyMoneySecurity NewUserWizard::Wizard::baseCurrency(void) const return m_baseCurrency; } -QValueList<MyMoneyTemplate> NewUserWizard::Wizard::templates(void) const +TQValueList<MyMoneyTemplate> NewUserWizard::Wizard::templates(void) const { return m_categoriesPage->selectedTemplates(); } @@ -172,8 +172,8 @@ GeneralPage::GeneralPage(Wizard* wizard, const char* name) : { m_userNameEdit->setFocus(); KABC::StdAddressBook *ab = KABC::StdAddressBook::self(true); - connect(ab, SIGNAL(addressBookChanged(AddressBook*)), this, SLOT(slotAddressBookLoaded())); - connect(m_loadAddressButton, SIGNAL(clicked()), this, SLOT(slotLoadFromKABC())); + connect(ab, TQT_SIGNAL(addressBookChanged(AddressBook*)), this, TQT_SLOT(slotAddressBookLoaded())); + connect(m_loadAddressButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadFromKABC())); m_loadAddressButton->setEnabled(false); } @@ -205,10 +205,10 @@ void GeneralPage::slotLoadFromKABC(void) m_telephoneEdit->setText( phone.number() ); KABC::Address a = addr.address( KABC::Address::Home ); - QString sep; + TQString sep; if(!a.country().isEmpty() && !a.region().isEmpty()) sep = " / "; - m_countyEdit->setText(QString("%1%2%3").arg(a.country(), sep, a.region())); + m_countyEdit->setText(TQString("%1%2%3").tqarg(a.country(), sep, a.region())); m_postcodeEdit->setText( a.postalCode() ); m_townEdit->setText( a.locality() ); m_streetEdit->setText( a.street() ); @@ -223,25 +223,25 @@ CurrencyPage::CurrencyPage(Wizard* wizard, const char* name) : Currency(wizard), WizardPage<Wizard>(stepCount++, this, wizard, name) { - QListViewItem *first = 0; - QValueList<MyMoneySecurity> list = MyMoneyFile::instance()->currencyList(); - QValueList<MyMoneySecurity>::const_iterator it; + TQListViewItem *first = 0; + TQValueList<MyMoneySecurity> list = MyMoneyFile::instance()->currencyList(); + TQValueList<MyMoneySecurity>::const_iterator it; - QString localCurrency(localeconv()->int_curr_symbol); + TQString localCurrency(localeconv()->int_curr_symbol); localCurrency.truncate(3); - QString baseCurrency = MyMoneyFile::instance()->baseCurrency().id(); + TQString baseCurrency = MyMoneyFile::instance()->baseCurrency().id(); // construct a transparent 16x16 pixmap - QPixmap empty(16, 16); - empty.setMask(QBitmap(16, 16, true)); + TQPixmap empty(16, 16); + empty.setMask(TQBitmap(16, 16, true)); m_currencyList->clear(); for(it = list.begin(); it != list.end(); ++it) { - QListViewItem* p = insertCurrency(*it); + TQListViewItem* p = insertCurrency(*it); if((*it).id() == baseCurrency) { first = p; - p->setPixmap(0, QPixmap( locate("icon","hicolor/16x16/apps/kmymoney2.png"))); + p->setPixmap(0, TQPixmap( locate("icon","hicolor/16x16/apps/kmymoney2.png"))); } else { p->setPixmap(0, empty); } @@ -276,10 +276,10 @@ AccountPage::AccountPage(Wizard* wizard, const char* name) : WizardPage<Wizard>(stepCount, this, wizard, name) // don't inc. the step count here { m_mandatoryGroup->add(m_accountNameEdit); - connect(m_mandatoryGroup, SIGNAL(stateChanged()), object(), SIGNAL(completeStateChanged())); - connect(m_haveCheckingAccountButton, SIGNAL(toggled(bool)), object(), SIGNAL(completeStateChanged())); + connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged())); + connect(m_haveCheckingAccountButton, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged())); m_accountNameEdit->setFocus(); - m_openingDateEdit->setDate(QDate(QDate::currentDate().year(),1,1)); + m_openingDateEdit->setDate(TQDate(TQDate::tqcurrentDate().year(),1,1)); } KMyMoneyWizardPage* AccountPage::nextPage(void) const @@ -303,7 +303,7 @@ KMyMoneyWizardPage* CategoriesPage::nextPage(void) const return m_wizard->m_preferencePage; } -QValueList<MyMoneyTemplate> CategoriesPage::selectedTemplates(void) const +TQValueList<MyMoneyTemplate> CategoriesPage::selectedTemplates(void) const { return m_templateSelector->selectedTemplates(); } @@ -312,7 +312,7 @@ PreferencePage::PreferencePage(Wizard* wizard, const char* name) : KPreferencePageDecl(wizard), WizardPage<Wizard>(stepCount++, this, wizard, name) { - connect(m_openConfigButton, SIGNAL(clicked()), kmymoney2, SLOT(slotSettings())); + connect(m_openConfigButton, TQT_SIGNAL(clicked()), kmymoney2, TQT_SLOT(slotSettings())); } KMyMoneyWizardPage* PreferencePage::nextPage(void) const @@ -325,11 +325,11 @@ FilePage::FilePage(Wizard* wizard, const char* name) : WizardPage<Wizard>(stepCount++, this, wizard, name) { m_mandatoryGroup->add(m_dataFileEdit->lineEdit()); - connect(m_mandatoryGroup, SIGNAL(stateChanged()), object(), SIGNAL(completeStateChanged())); + connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged())); KUser user; m_dataFileEdit->setShowLocalProtocol(false); - m_dataFileEdit->setURL(QString("%1/%2.kmy").arg(QDir::homeDirPath(), user.loginName())); + m_dataFileEdit->setURL(TQString("%1/%2.kmy").tqarg(TQDir::homeDirPath(), user.loginName())); // allow selection of non-existing files m_dataFileEdit->setMode(KFile::File); @@ -346,7 +346,7 @@ bool FilePage::isComplete(void) const // b) the directory does exist rc = !KIO::NetAccess::exists(m_dataFileEdit->url(), false, m_wizard); if(rc) { - QRegExp exp("(.*)/(.*)"); + TQRegExp exp("(.*)/(.*)"); rc = false; if(exp.search(m_dataFileEdit->url()) != -1) { if(exp.cap(2).length() > 0) { diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.h b/kmymoney2/wizards/newuserwizard/knewuserwizard.h index a8cd8d5..25e010f 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard.h +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QString; +class TQString; // ---------------------------------------------------------------------------- // Project Includes @@ -65,8 +65,9 @@ class Wizard : public KMyMoneyWizard friend class FilePage; Q_OBJECT + TQ_OBJECT public: - Wizard(QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); + Wizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags flags = 0); /** * Returns the personal information of the user (e.g. name, address, etc.) */ @@ -75,7 +76,7 @@ public: /** * Returns the URL that the user has chosen to store the file */ - QString url(void) const; + TQString url(void) const; /** * Returns the information about an institution if entered by @@ -104,7 +105,7 @@ public: /** * Returns a list of templates including accounts to be created */ - QValueList<MyMoneyTemplate> templates(void) const; + TQValueList<MyMoneyTemplate> templates(void) const; private: MyMoneySecurity m_baseCurrency; diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h index aa62725..ea1910a 100644 --- a/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h +++ b/kmymoney2/wizards/newuserwizard/knewuserwizard_p.h @@ -44,8 +44,9 @@ namespace NewUserWizard { class IntroPage : public KIntroPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - IntroPage(Wizard* parent, const char* name = 0); + IntroPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; }; @@ -57,8 +58,9 @@ public: class GeneralPage : public UserInfo, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - GeneralPage(Wizard* parent, const char* name = 0); + GeneralPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; protected slots: @@ -75,8 +77,9 @@ protected slots: class CurrencyPage : public Currency, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - CurrencyPage(Wizard* parent, const char* name = 0); + CurrencyPage(Wizard* tqparent, const char* name = 0); void enterPage(void); KMyMoneyWizardPage* nextPage(void) const; }; @@ -87,8 +90,9 @@ public: class AccountPage : public KAccountPageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - AccountPage(Wizard* parent, const char* name = 0); + AccountPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; virtual bool isComplete(void) const; @@ -102,10 +106,11 @@ public: class CategoriesPage : public Accounts, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - CategoriesPage(Wizard* parent, const char* name = 0); + CategoriesPage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; - QValueList<MyMoneyTemplate> selectedTemplates(void) const; + TQValueList<MyMoneyTemplate> selectedTemplates(void) const; }; /** @@ -116,8 +121,9 @@ public: class PreferencePage : public KPreferencePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - PreferencePage(Wizard* parent, const char* name = 0); + PreferencePage(Wizard* tqparent, const char* name = 0); KMyMoneyWizardPage* nextPage(void) const; }; @@ -129,8 +135,9 @@ public: class FilePage : public KFilePageDecl, public WizardPage<Wizard> { Q_OBJECT + TQ_OBJECT public: - FilePage(Wizard* parent, const char* name = 0); + FilePage(Wizard* tqparent, const char* name = 0); virtual bool isComplete(void) const; }; diff --git a/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui b/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui index 3d3c062..95002a3 100644 --- a/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kpasswordpagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KPasswordPageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPasswordPageDecl</cstring> </property> @@ -29,5 +29,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui index bfe6446..95838b7 100644 --- a/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KPreferencePageDecl</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPreferencePageDecl</cstring> </property> @@ -27,9 +27,9 @@ <string>If you would like to review or change any preference settings for KMyMoney at this time, you can do so here. If not just click <b>Next</b>.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -72,7 +72,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 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> 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> |