From fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 06:00:29 +0000 Subject: TQt4 port kmymoney This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1239855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmymoney2/dialogs/settings/ksettingscolors.cpp | 4 +- kmymoney2/dialogs/settings/ksettingscolors.h | 3 +- kmymoney2/dialogs/settings/ksettingscolorsdecl.ui | 42 ++++----- kmymoney2/dialogs/settings/ksettingsfonts.cpp | 4 +- kmymoney2/dialogs/settings/ksettingsfonts.h | 3 +- kmymoney2/dialogs/settings/ksettingsfontsdecl.ui | 18 ++-- kmymoney2/dialogs/settings/ksettingsforecast.cpp | 4 +- kmymoney2/dialogs/settings/ksettingsforecast.h | 3 +- .../dialogs/settings/ksettingsforecastdecl.ui | 52 ++++++------ kmymoney2/dialogs/settings/ksettingsgeneral.cpp | 14 +-- kmymoney2/dialogs/settings/ksettingsgeneral.h | 5 +- kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui | 99 +++++++++++----------- kmymoney2/dialogs/settings/ksettingsgpg.cpp | 50 +++++------ kmymoney2/dialogs/settings/ksettingsgpg.h | 3 +- kmymoney2/dialogs/settings/ksettingsgpgdecl.ui | 34 ++++---- kmymoney2/dialogs/settings/ksettingshome.cpp | 54 ++++++------ kmymoney2/dialogs/settings/ksettingshome.h | 7 +- kmymoney2/dialogs/settings/ksettingshomedecl.ui | 36 ++++---- .../dialogs/settings/ksettingsonlinequotes.cpp | 74 ++++++++-------- kmymoney2/dialogs/settings/ksettingsonlinequotes.h | 13 +-- .../dialogs/settings/ksettingsonlinequotesdecl.ui | 26 +++--- kmymoney2/dialogs/settings/ksettingsplugins.cpp | 18 ++-- kmymoney2/dialogs/settings/ksettingsplugins.h | 7 +- kmymoney2/dialogs/settings/ksettingsregister.cpp | 22 ++--- kmymoney2/dialogs/settings/ksettingsregister.h | 3 +- .../dialogs/settings/ksettingsregisterdecl.ui | 85 ++++++++++--------- kmymoney2/dialogs/settings/ksettingsschedules.cpp | 4 +- kmymoney2/dialogs/settings/ksettingsschedules.h | 3 +- .../dialogs/settings/ksettingsschedulesdecl.ui | 24 +++--- 29 files changed, 365 insertions(+), 349 deletions(-) (limited to 'kmymoney2/dialogs/settings') diff --git a/kmymoney2/dialogs/settings/ksettingscolors.cpp b/kmymoney2/dialogs/settings/ksettingscolors.cpp index 727241c..06a5199 100644 --- a/kmymoney2/dialogs/settings/ksettingscolors.cpp +++ b/kmymoney2/dialogs/settings/ksettingscolors.cpp @@ -25,8 +25,8 @@ #include "ksettingscolors.h" -KSettingsColors::KSettingsColors(QWidget* parent, const char* name) : - KSettingsColorsDecl(parent, name) +KSettingsColors::KSettingsColors(TQWidget* tqparent, const char* name) : + KSettingsColorsDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingscolors.h b/kmymoney2/dialogs/settings/ksettingscolors.h index 896ad85..0f877a2 100644 --- a/kmymoney2/dialogs/settings/ksettingscolors.h +++ b/kmymoney2/dialogs/settings/ksettingscolors.h @@ -31,9 +31,10 @@ class KSettingsColors : public KSettingsColorsDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsColors(QWidget* parent = 0, const char* name = 0); + KSettingsColors(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsColors(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui index 2d4d15b..98fe42b 100644 --- a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui @@ -1,6 +1,6 @@ KSettingsColorsDecl - + KSettingsColorsDecl @@ -19,11 +19,11 @@ unnamed - + tabWidget2 - + tab @@ -34,7 +34,7 @@ unnamed - + groupBox3 @@ -45,7 +45,7 @@ unnamed - + textLabel3 @@ -53,7 +53,7 @@ Grid color - + textLabel1_3 @@ -61,7 +61,7 @@ Erronous transaction - + textLabel4 @@ -99,7 +99,7 @@ - + textLabel5 @@ -157,7 +157,7 @@ Expanding - + 21 20 @@ -166,7 +166,7 @@ - + tab @@ -177,7 +177,7 @@ unnamed - + kcfg_useSystemColors @@ -185,7 +185,7 @@ Use system colors - + m_individualColorFrame @@ -196,7 +196,7 @@ unnamed - + textLabel2 @@ -204,7 +204,7 @@ Normal - + textLabel1 @@ -252,7 +252,7 @@ - + groupBox5 @@ -263,7 +263,7 @@ unnamed - + textLabel1_5 @@ -286,7 +286,7 @@ - + textLabel1_2 @@ -317,7 +317,7 @@ - + textLabel1_4 @@ -340,7 +340,7 @@ - + textLabel2_2 @@ -382,7 +382,7 @@ Expanding - + 20 20 @@ -402,5 +402,5 @@ setDisabled(bool) - + diff --git a/kmymoney2/dialogs/settings/ksettingsfonts.cpp b/kmymoney2/dialogs/settings/ksettingsfonts.cpp index a4aef71..c21437d 100644 --- a/kmymoney2/dialogs/settings/ksettingsfonts.cpp +++ b/kmymoney2/dialogs/settings/ksettingsfonts.cpp @@ -25,8 +25,8 @@ #include "ksettingsfonts.h" -KSettingsFonts::KSettingsFonts(QWidget* parent, const char* name) : - KSettingsFontsDecl(parent, name) +KSettingsFonts::KSettingsFonts(TQWidget* tqparent, const char* name) : + KSettingsFontsDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingsfonts.h b/kmymoney2/dialogs/settings/ksettingsfonts.h index 40cb9de..eda94fd 100644 --- a/kmymoney2/dialogs/settings/ksettingsfonts.h +++ b/kmymoney2/dialogs/settings/ksettingsfonts.h @@ -31,9 +31,10 @@ class KSettingsFonts : public KSettingsFontsDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsFonts(QWidget* parent = 0, const char* name = 0); + KSettingsFonts(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsFonts(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui index cbaefeb..6cb100a 100644 --- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui @@ -1,6 +1,6 @@ KSettingsFontsDecl - + KSettingsFontsDecl @@ -19,7 +19,7 @@ unnamed - + kcfg_useSystemFont @@ -27,7 +27,7 @@ Use system fonts - + m_individualFontsFrame @@ -58,7 +58,7 @@ Expanding - + 110 20 @@ -75,14 +75,14 @@ Expanding - + 100 20 - + textLabel1 @@ -90,7 +90,7 @@ Cell font - + textLabel2 @@ -110,7 +110,7 @@ Expanding - + 20 30 @@ -127,5 +127,5 @@ setDisabled(bool) - + diff --git a/kmymoney2/dialogs/settings/ksettingsforecast.cpp b/kmymoney2/dialogs/settings/ksettingsforecast.cpp index 0a74252..d3e8770 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecast.cpp +++ b/kmymoney2/dialogs/settings/ksettingsforecast.cpp @@ -25,8 +25,8 @@ #include "ksettingsforecast.h" -KSettingsForecast::KSettingsForecast(QWidget* parent, const char* name) : - KSettingsForecastDecl(parent, name) +KSettingsForecast::KSettingsForecast(TQWidget* tqparent, const char* name) : + KSettingsForecastDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingsforecast.h b/kmymoney2/dialogs/settings/ksettingsforecast.h index 7195eee..4423a39 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecast.h +++ b/kmymoney2/dialogs/settings/ksettingsforecast.h @@ -32,9 +32,10 @@ class KSettingsForecast : public KSettingsForecastDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsForecast(QWidget* parent = 0, const char* name = 0); + KSettingsForecast(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsForecast(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui index c412f81..c3f90df 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui @@ -1,6 +1,6 @@ KSettingsForecastDecl - + KSettingsForecastDecl @@ -19,7 +19,7 @@ unnamed - + groupBox6 @@ -38,28 +38,28 @@ unnamed - + - layout7 + tqlayout7 unnamed - + - layout5 + tqlayout5 unnamed - + kcfg_forecastAccountCycle - + textLabel2 @@ -67,12 +67,12 @@ Number of Days of Account Cycle: - + kcfg_forecastDays - + textLabel1 @@ -80,12 +80,12 @@ Day of Month to start Forecast: - + kcfg_beginForecastDay - + textLabel4 @@ -105,7 +105,7 @@ Expanding - + 133 21 @@ -114,7 +114,7 @@ - + kcfg_forecastMethod @@ -125,7 +125,7 @@ unnamed - + radioButton9 @@ -136,7 +136,7 @@ 0 - + radioButton10 @@ -149,7 +149,7 @@ - + groupBox3 @@ -164,7 +164,7 @@ unnamed - + textLabel3 @@ -172,7 +172,7 @@ Number of Cycles to use in Forecast: - + kcfg_forecastCycles @@ -187,7 +187,7 @@ Expanding - + 130 21 @@ -195,7 +195,7 @@ - + kcfg_historyMethod @@ -206,7 +206,7 @@ unnamed - + radioButton11 @@ -217,7 +217,7 @@ 0 - + radioButton12 @@ -228,7 +228,7 @@ 1 - + radioButton13 @@ -255,7 +255,7 @@ Expanding - + 20 40 @@ -264,5 +264,5 @@ - + diff --git a/kmymoney2/dialogs/settings/ksettingsgeneral.cpp b/kmymoney2/dialogs/settings/ksettingsgeneral.cpp index 5acdd08..e36530f 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneral.cpp +++ b/kmymoney2/dialogs/settings/ksettingsgeneral.cpp @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -31,8 +31,8 @@ #include #include "ksettingsgeneral.h" -KSettingsGeneral::KSettingsGeneral(QWidget* parent, const char* name) : - KSettingsGeneralDecl(parent, name) +KSettingsGeneral::KSettingsGeneral(TQWidget* tqparent, const char* name) : + KSettingsGeneralDecl(tqparent, name) { // hide the internally used date field kcfg_StartDate->hide(); @@ -43,20 +43,20 @@ KSettingsGeneral::KSettingsGeneral(QWidget* parent, const char* name) : m_viewList->hide(); // setup connections, so that the sort optios get loaded once the edit fields are filled - connect(kcfg_StartDate, SIGNAL(valueChanged(const QDate&)), this, SLOT(slotLoadStartDate(const QDate&))); + connect(kcfg_StartDate, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotLoadStartDate(const TQDate&))); // setup connections, so that changes by the user are forwarded to the (hidden) edit fields - connect(m_startDateEdit, SIGNAL(dateChanged(const QDate&)), kcfg_StartDate, SLOT(setDate(const QDate&))); + connect(m_startDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), kcfg_StartDate, TQT_SLOT(setDate(const TQDate&))); } KSettingsGeneral::~KSettingsGeneral() { } -void KSettingsGeneral::slotLoadStartDate(const QDate&) +void KSettingsGeneral::slotLoadStartDate(const TQDate&) { // only need this once - disconnect(kcfg_StartDate, SIGNAL(valueChanged(const QDate&)), this, SLOT(slotLoadStartDate(const QDate&))); + disconnect(kcfg_StartDate, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotLoadStartDate(const TQDate&))); m_startDateEdit->setDate(kcfg_StartDate->date()); } diff --git a/kmymoney2/dialogs/settings/ksettingsgeneral.h b/kmymoney2/dialogs/settings/ksettingsgeneral.h index 3bd0992..246a600 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneral.h +++ b/kmymoney2/dialogs/settings/ksettingsgeneral.h @@ -31,13 +31,14 @@ class KSettingsGeneral : public KSettingsGeneralDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsGeneral(QWidget* parent = 0, const char* name = 0); + KSettingsGeneral(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsGeneral(); protected slots: - void slotLoadStartDate(const QDate&); + void slotLoadStartDate(const TQDate&); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui index 9eeb181..b851f2b 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui @@ -1,6 +1,6 @@ KSettingsGeneralDecl - + KSettingsGeneralDecl @@ -19,11 +19,11 @@ unnamed - + tabWidget2 - + tab @@ -34,7 +34,7 @@ unnamed - + kcfg_StartLastViewSelected @@ -48,7 +48,7 @@ unnamed - + radioButton1 @@ -62,7 +62,7 @@ 0 - + radioButton2 @@ -75,7 +75,7 @@ - + groupBox1 @@ -86,7 +86,7 @@ unnamed - + textLabel1 @@ -94,7 +94,7 @@ Price precision - + kcfg_PricePrecision @@ -102,7 +102,7 @@ 10 - + textLabel2 @@ -120,7 +120,7 @@ Expanding - + 61 21 @@ -129,7 +129,7 @@ - + groupBox3 @@ -140,7 +140,7 @@ unnamed - + kcfg_AutoSaveFile @@ -148,7 +148,7 @@ Autosave periodically - + m_periodFrame @@ -168,7 +168,7 @@ 0 - + kcfg_AutoSavePeriod @@ -176,7 +176,7 @@ 60 - + textLabel3 @@ -194,7 +194,7 @@ Expanding - + 354 20 @@ -205,7 +205,7 @@ - + groupBox6 @@ -216,7 +216,7 @@ unnamed - + textLabel1_2_2 @@ -304,7 +304,7 @@ Expanding - + 90 20 @@ -323,7 +323,7 @@ Expanding - + 20 20 @@ -332,7 +332,7 @@ - + tab @@ -343,7 +343,7 @@ unnamed - + kcfg_syncLedgerInvestment @@ -359,14 +359,14 @@ true - + m_viewLabel Check the views you want to enable, uncheck those you want to hide, because you don't need the functionality. - + WordBreak|AlignTop @@ -383,7 +383,7 @@ - + kcfg_iconSize @@ -397,7 +397,7 @@ unnamed - + radioButton3 @@ -405,7 +405,7 @@ Micro (16px) - + radioButton4 @@ -413,7 +413,7 @@ Small (32px) - + radioButton5 @@ -424,7 +424,7 @@ true - + radioButton6 @@ -434,7 +434,7 @@ - + kcfg_showTitleBar @@ -452,7 +452,7 @@ Expanding - + 20 21 @@ -461,7 +461,7 @@ - + TabPage @@ -472,7 +472,7 @@ unnamed - + groupBox2 @@ -483,7 +483,7 @@ unnamed - + kcfg_HideUnusedCategory @@ -494,7 +494,7 @@ This option hides all categories in the categories view that are not used in at least a single transaction. They are still shown in the category selection lists. - + kcfg_HideClosedAccounts @@ -507,7 +507,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden accounts in the views. - + kcfg_ExpertMode @@ -517,7 +517,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden - + groupBox4 @@ -528,7 +528,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden unnamed - + kcfg_HideFinishedSchedules @@ -541,7 +541,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden - + groupBox5 @@ -552,15 +552,15 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden unnamed - + - layout2 + tqlayout2 unnamed - + textLabel1_3 @@ -573,7 +573,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden m_startDateEdit - + kcfg_StartDate @@ -588,7 +588,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden Expanding - + 63 20 @@ -597,7 +597,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden - + kcfg_HideReconciledTransactions @@ -620,7 +620,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden Expanding - + 20 30 @@ -642,5 +642,8 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden setEnabled(bool) - + + kmymoney/kmymoneydateinput.h + + diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp index 2dba83e..133700d 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp +++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp @@ -17,9 +17,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include -#include -#include +#include +#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -40,8 +40,8 @@ #define RECOVER_KEY_ID "0xD2B08440" #define RECOVER_KEY_ID_FULL "59B0F826D2B08440" -KSettingsGpg::KSettingsGpg(QWidget* parent, const char* name) : - KSettingsGpgDecl(parent, name), +KSettingsGpg::KSettingsGpg(TQWidget* tqparent, const char* name) : + KSettingsGpgDecl(tqparent, name), m_checkCount(0), m_needCheckList(true), m_listOk(false) @@ -51,11 +51,11 @@ KSettingsGpg::KSettingsGpg(QWidget* parent, const char* name) : // don't show the widget in which the master key is actually kept kcfg_GpgRecipient->hide(); - connect(kcfg_WriteDataEncrypted, SIGNAL(toggled(bool)), this, SLOT(slotStatusChanged(bool))); - connect(m_masterKeyCombo, SIGNAL(activated(int)), this, SLOT(slotIdChanged())); - connect(kcfg_GpgRecipientList, SIGNAL(changed()), this, SLOT(slotIdChanged())); - connect(kcfg_GpgRecipientList, SIGNAL(added(const QString&)), this, SLOT(slotKeyListChanged())); - connect(kcfg_GpgRecipientList, SIGNAL(removed(const QString&)), this, SLOT(slotKeyListChanged())); + connect(kcfg_WriteDataEncrypted, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStatusChanged(bool))); + connect(m_masterKeyCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotIdChanged())); + connect(kcfg_GpgRecipientList, TQT_SIGNAL(changed()), this, TQT_SLOT(slotIdChanged())); + connect(kcfg_GpgRecipientList, TQT_SIGNAL(added(const TQString&)), this, TQT_SLOT(slotKeyListChanged())); + connect(kcfg_GpgRecipientList, TQT_SIGNAL(removed(const TQString&)), this, TQT_SLOT(slotKeyListChanged())); // Initial state setup slotStatusChanged(kcfg_WriteDataEncrypted->isChecked()); @@ -93,8 +93,8 @@ void KSettingsGpg::slotIdChanged(void) // if it is available, then scan the current list if we need to if(keysOk) { if(m_needCheckList) { - QStringList keys = kcfg_GpgRecipientList->items(); - QStringList::const_iterator it_s; + TQStringList keys = kcfg_GpgRecipientList->items(); + TQStringList::const_iterator it_s; for(it_s = keys.begin(); keysOk && it_s != keys.end(); ++it_s) { if(!KGPGFile::keyAvailable(*it_s)) keysOk = false; @@ -115,7 +115,7 @@ void KSettingsGpg::slotIdChanged(void) // if we have a master key, we store it in the hidden widget if(m_masterKeyCombo->currentItem() != 0) { - QRegExp keyExp(".* \\((.*)\\)"); + TQRegExp keyExp(".* \\((.*)\\)"); if(keyExp.search(m_masterKeyCombo->currentText()) != -1) { kcfg_GpgRecipient->setText(keyExp.cap(1)); } @@ -131,10 +131,10 @@ void KSettingsGpg::slotIdChanged(void) void KSettingsGpg::show(void) { - QString masterKey; + TQString masterKey; if(m_masterKeyCombo->currentItem() != 0) { - QRegExp keyExp(".* \\((.*)\\)"); + TQRegExp keyExp(".* \\((.*)\\)"); if(keyExp.search(m_masterKeyCombo->currentText()) != -1) { masterKey = keyExp.cap(1); } @@ -143,19 +143,19 @@ void KSettingsGpg::show(void) // fill the secret key combobox with a fresh list m_masterKeyCombo->clear(); - QStringList keyList; + TQStringList keyList; KGPGFile::secretKeyList(keyList); - for(QStringList::iterator it = keyList.begin(); it != keyList.end(); ++it) { - QStringList fields = QStringList::split(":", *it); + for(TQStringList::iterator it = keyList.begin(); it != keyList.end(); ++it) { + TQStringList fields = TQStringList::split(":", *it); if(fields[0] != RECOVER_KEY_ID_FULL) { - // replace parenthesis in name field with brackets - QString name = fields[1]; - name.replace('(', "["); - name.replace(')', "]"); - name = QString("%1 (0x%2)").arg(name).arg(fields[0]); + // replace tqparenthesis in name field with brackets + TQString name = fields[1]; + name.tqreplace('(', "["); + name.tqreplace(')', "]"); + name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]); m_masterKeyCombo->insertItem(name); - if(name.contains(masterKey)) + if(name.tqcontains(masterKey)) m_masterKeyCombo->setCurrentItem(name); } } @@ -177,7 +177,7 @@ void KSettingsGpg::slotStatusChanged(bool state) state = false; if((state == true) && (oncePerSession == true) && isVisible()) { - KMessageBox::information(this, QString("%1").arg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the File/Save as... feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); + KMessageBox::information(this, TQString("%1").tqarg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the File/Save as... feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); oncePerSession = false; } diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.h b/kmymoney2/dialogs/settings/ksettingsgpg.h index ecea6ab..2508192 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpg.h +++ b/kmymoney2/dialogs/settings/ksettingsgpg.h @@ -32,9 +32,10 @@ class KSettingsGpg : public KSettingsGpgDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsGpg(QWidget* parent = 0, const char* name = 0); + KSettingsGpg(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsGpg(); public slots: diff --git a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui index 15d3bbe..0d82e45 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui @@ -1,6 +1,6 @@ KSettingsGpgDecl - + KSettingsGpgDecl @@ -24,7 +24,7 @@ The <i>additional recovery encryption</i> is only accessible, if the unnamed - + kcfg_WriteDataEncrypted @@ -32,7 +32,7 @@ The <i>additional recovery encryption</i> is only accessible, if the Use GPG encryption - + m_idGroup @@ -46,15 +46,15 @@ The <i>additional recovery encryption</i> is only accessible, if the unnamed - + - layout3 + tqlayout3 unnamed - + textLabel1_2 @@ -102,9 +102,9 @@ The <i>additional recovery encryption</i> is only accessible, if the Enter the id of the key you want to use for data encryption. This can either be an e-mail address or the hexadecimal key id. In case of the key id don't forget the leading 0x. - + - layout6 + tqlayout6 @@ -124,7 +124,7 @@ The <i>additional recovery encryption</i> is only accessible, if the This symbol denotes, if the key for the given user id has been found in your keyring. It is green when found, dark otherwise. - + textLabel1 @@ -142,7 +142,7 @@ The <i>additional recovery encryption</i> is only accessible, if the Expanding - + 50 20 @@ -151,9 +151,9 @@ The <i>additional recovery encryption</i> is only accessible, if the - + - layout5 + tqlayout5 @@ -173,7 +173,7 @@ The <i>additional recovery encryption</i> is only accessible, if the This symbol denotes, if the KMyMoney recovery key has been found in your keyring. It is green when found, dark otherwise. - + textLabel2 @@ -191,7 +191,7 @@ The <i>additional recovery encryption</i> is only accessible, if the Expanding - + 16 20 @@ -200,7 +200,7 @@ The <i>additional recovery encryption</i> is only accessible, if the - + kcfg_EncryptRecover @@ -225,7 +225,7 @@ This mechanism is provided for the case that you have lost your key and cannot a Expanding - + 21 30 @@ -234,5 +234,5 @@ This mechanism is provided for the case that you have lost your key and cannot a - + diff --git a/kmymoney2/dialogs/settings/ksettingshome.cpp b/kmymoney2/dialogs/settings/ksettingshome.cpp index d2f471b..a874de7 100644 --- a/kmymoney2/dialogs/settings/ksettingshome.cpp +++ b/kmymoney2/dialogs/settings/ksettingshome.cpp @@ -17,8 +17,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include -#include +#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -38,8 +38,8 @@ #include "kmymoney2/kmymoneyglobalsettings.h" #include "kmymoney2/kmymoneyutils.h" -KSettingsHome::KSettingsHome(QWidget* parent, const char* name) : - KSettingsHomeDecl(parent, name), +KSettingsHome::KSettingsHome(TQWidget* tqparent, const char* name) : + KSettingsHomeDecl(tqparent, name), m_noNeedToUpdateList(false) { m_homePageList->addColumn(""); @@ -49,11 +49,11 @@ KSettingsHome::KSettingsHome(QWidget* parent, const char* name) : KIconLoader* il = KGlobal::iconLoader(); KGuiItem upButtonItem( i18n( "&Up" ), - QIconSet(il->loadIcon("up", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("up", KIcon::Small, KIcon::SizeSmall)), i18n("Move selected item up"), i18n("Use this to move the selected item up by one position in the list.")); KGuiItem downButtonItem( i18n( "&Down" ), - QIconSet(il->loadIcon("down", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("down", KIcon::Small, KIcon::SizeSmall)), i18n("Move selected item down"), i18n("Use this to move the selected item down by one position in the list.")); @@ -63,14 +63,14 @@ KSettingsHome::KSettingsHome(QWidget* parent, const char* name) : m_downButton->setEnabled(false); // connect this, so that the list gets loaded once the edit field is filled - connect(kcfg_ItemList, SIGNAL(textChanged()), this, SLOT(slotLoadItems())); + connect(kcfg_ItemList, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadItems())); - connect(m_homePageList, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(slotSelectHomePageItem(QListViewItem *))); - connect(m_homePageList, SIGNAL(pressed(QListViewItem*)), this, SLOT(slotUpdateItemList())); + connect(m_homePageList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(slotSelectHomePageItem(TQListViewItem *))); + connect(m_homePageList, TQT_SIGNAL(pressed(TQListViewItem*)), this, TQT_SLOT(slotUpdateItemList())); - connect(m_upButton, SIGNAL(clicked()), this, SLOT(slotMoveUp())); - connect(m_downButton, SIGNAL(clicked()), this, SLOT(slotMoveDown())); + connect(m_upButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUp())); + connect(m_downButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDown())); // Don't show it to the user, we only need it to load and save the settings kcfg_ItemList->hide(); @@ -85,14 +85,14 @@ void KSettingsHome::slotLoadItems(void) if(m_noNeedToUpdateList) return; - QStringList list = KMyMoneyGlobalSettings::itemList(); - QStringList::ConstIterator it; + TQStringList list = KMyMoneyGlobalSettings::itemList(); + TQStringList::ConstIterator it; int w = 0; m_homePageList->clear(); - QCheckListItem *sel = 0; + TQCheckListItem *sel = 0; - QFontMetrics fm( KGlobalSettings::generalFont()); - QCheckListItem* last = 0; + TQFontMetrics fm( KGlobalSettings::generalFont()); + TQCheckListItem* last = 0; for(it = list.begin(); it != list.end(); ++it) { int idx = (*it).toInt(); @@ -101,7 +101,7 @@ void KSettingsHome::slotLoadItems(void) continue; bool enabled = idx > 0; if(!enabled) idx = -idx; - QCheckListItem* item = new QCheckListItem(m_homePageList, KMyMoneyUtils::homePageItemToString(idx), QCheckListItem::CheckBox); + TQCheckListItem* item = new TQCheckListItem(m_homePageList, KMyMoneyUtils::homePageItemToString(idx), TQCheckListItem::CheckBox); if(last) item->moveItem(last); @@ -123,14 +123,14 @@ void KSettingsHome::slotLoadItems(void) void KSettingsHome::slotUpdateItemList(void) { - QString list; - QListViewItem *it; + TQString list; + TQListViewItem *it; for(it = m_homePageList->firstChild(); it; ) { int item = KMyMoneyUtils::stringToHomePageItem(it->text(0)); - if(!(static_cast(it)->isOn())) + if(!(static_cast(it)->isOn())) item = -item; - list += QString::number(item); + list += TQString::number(item); it = it->nextSibling(); if(it) list += ","; @@ -142,7 +142,7 @@ void KSettingsHome::slotUpdateItemList(void) m_noNeedToUpdateList = false; } -void KSettingsHome::slotSelectHomePageItem(QListViewItem *item) +void KSettingsHome::slotSelectHomePageItem(TQListViewItem *item) { m_upButton->setEnabled(m_homePageList->firstChild() != item); m_downButton->setEnabled(item->nextSibling()); @@ -150,8 +150,8 @@ void KSettingsHome::slotSelectHomePageItem(QListViewItem *item) void KSettingsHome::slotMoveUp(void) { - QListViewItem *item = m_homePageList->currentItem(); - QListViewItem *prev = item->itemAbove(); + TQListViewItem *item = m_homePageList->currentItem(); + TQListViewItem *prev = item->itemAbove(); if(prev) { prev->moveItem(item); slotSelectHomePageItem(item); @@ -161,8 +161,8 @@ void KSettingsHome::slotMoveUp(void) void KSettingsHome::slotMoveDown(void) { - QListViewItem *item = m_homePageList->currentItem(); - QListViewItem *next = item->nextSibling(); + TQListViewItem *item = m_homePageList->currentItem(); + TQListViewItem *next = item->nextSibling(); if(next) { item->moveItem(next); slotSelectHomePageItem(item); diff --git a/kmymoney2/dialogs/settings/ksettingshome.h b/kmymoney2/dialogs/settings/ksettingshome.h index c461210..9717b2d 100644 --- a/kmymoney2/dialogs/settings/ksettingshome.h +++ b/kmymoney2/dialogs/settings/ksettingshome.h @@ -20,7 +20,7 @@ // ---------------------------------------------------------------------------- // QT Includes -class QListViewItem; +class TQListViewItem; // ---------------------------------------------------------------------------- // KDE Includes @@ -33,15 +33,16 @@ class QListViewItem; class KSettingsHome : public KSettingsHomeDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsHome(QWidget* parent = 0, const char* name = 0); + KSettingsHome(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsHome(); protected slots: void slotLoadItems(void); void slotUpdateItemList(void); - void slotSelectHomePageItem(QListViewItem *); + void slotSelectHomePageItem(TQListViewItem *); void slotMoveUp(void); void slotMoveDown(void); diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui index 49f6251..c248697 100644 --- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui +++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui @@ -1,6 +1,6 @@ KSettingsHomeDecl - + KSettingsHomeDecl @@ -19,17 +19,17 @@ unnamed - + - layout9 + tqlayout9 unnamed - + - layout6 + tqlayout6 @@ -45,7 +45,7 @@ Fixed - + 20 20 @@ -78,7 +78,7 @@ Expanding - + 21 70 @@ -97,14 +97,14 @@ Expanding - + 80 21 - + textLabel4 @@ -118,9 +118,9 @@ Selected entries are shown on the home page of the application.<p> -Use the buttons and checkboxes to customize the layout of the home page. +Use the buttons and checkboxes to customize the tqlayout of the home page. - + WordBreak|AlignTop @@ -142,7 +142,7 @@ Use the buttons and checkboxes to customize the layout of the home page. - + groupbox @@ -153,7 +153,7 @@ Use the buttons and checkboxes to customize the layout of the home page. unnamed - + percentageLabel @@ -161,7 +161,7 @@ Use the buttons and checkboxes to customize the layout of the home page.Percentage of default font size: - + kcfg_RememberFontSize @@ -193,7 +193,7 @@ Use the buttons and checkboxes to customize the layout of the home page. Expanding - + 40 20 @@ -202,7 +202,7 @@ Use the buttons and checkboxes to customize the layout of the home page. - + groupbox2 @@ -213,7 +213,7 @@ Use the buttons and checkboxes to customize the layout of the home page. unnamed - + kcfg_ShowLimitInfo @@ -227,5 +227,5 @@ Use the buttons and checkboxes to customize the layout of the home page. - + diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp index db4dc1e..a17fd6e 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.cpp @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- // QT Includes -#include -#include +#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -39,10 +39,10 @@ #include "ksettingsonlinequotes.h" #include "kmymoney2/converter/webpricequote.h" -KSettingsOnlineQuotes::KSettingsOnlineQuotes(QWidget *parent, const char *name ) - : KSettingsOnlineQuotesDecl(parent, name) +KSettingsOnlineQuotes::KSettingsOnlineQuotes(TQWidget *tqparent, const char *name ) + : KSettingsOnlineQuotesDecl(tqparent, name) { - QStringList groups = WebPriceQuote::quoteSources(); + TQStringList groups = WebPriceQuote::quoteSources(); loadList(true /*updateResetList*/); @@ -50,36 +50,36 @@ KSettingsOnlineQuotes::KSettingsOnlineQuotes(QWidget *parent, const char *name ) KIconLoader* il = KGlobal::iconLoader(); KGuiItem updateButtenItem( i18n("&Update" ), - QIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("button_ok", KIcon::Small, KIcon::SizeSmall)), i18n("Accepts the entered data and stores it"), i18n("Use this to accept the modified data.")); m_updateButton->setGuiItem(updateButtenItem); KGuiItem deleteButtenItem( i18n( "&Delete" ), - QIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("editdelete", KIcon::Small, KIcon::SizeSmall)), i18n("Delete the selected source entry"), i18n("Use this to delete the selected online source entry")); m_deleteButton->setGuiItem(deleteButtenItem); KGuiItem newButtenItem( i18n( "&New..." ), - QIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), + TQIconSet(il->loadIcon("filenew", KIcon::Small, KIcon::SizeSmall)), i18n("Create a new source entry for online quotes"), i18n("Use this to create a new entry for online quotes")); m_newButton->setGuiItem(newButtenItem); - connect(m_updateButton, SIGNAL(clicked()), this, SLOT(slotUpdateEntry())); - connect(m_newButton, SIGNAL(clicked()), this, SLOT(slotNewEntry())); + connect(m_updateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateEntry())); + connect(m_newButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewEntry())); - connect(m_quoteSourceList, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(slotLoadWidgets(QListViewItem*))); - connect(m_quoteSourceList, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotLoadWidgets(QListViewItem*))); - connect(m_quoteSourceList, SIGNAL(itemRenamed(QListViewItem*,const QString&,int)), this, SLOT(slotEntryRenamed(QListViewItem*,const QString&,int))); + connect(m_quoteSourceList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotLoadWidgets(TQListViewItem*))); + connect(m_quoteSourceList, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotLoadWidgets(TQListViewItem*))); + connect(m_quoteSourceList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), this, TQT_SLOT(slotEntryRenamed(TQListViewItem*,const TQString&,int))); - connect(m_editURL, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editSymbol, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editDate, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editDateFormat, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_editPrice, SIGNAL(textChanged(const QString&)), this, SLOT(slotEntryChanged())); - connect(m_skipStripping, SIGNAL(toggled(bool)), this, SLOT(slotEntryChanged())); + connect(m_editURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editSymbol, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editDate, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editDateFormat, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_editPrice, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEntryChanged())); + connect(m_skipStripping, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEntryChanged())); // FIXME deleting a source is not yet implemented m_deleteButton->setEnabled(false); @@ -87,30 +87,30 @@ KSettingsOnlineQuotes::KSettingsOnlineQuotes(QWidget *parent, const char *name ) void KSettingsOnlineQuotes::loadList(const bool updateResetList) { - QStringList groups = WebPriceQuote::quoteSources(); + TQStringList groups = WebPriceQuote::quoteSources(); if(updateResetList) m_resetList.clear(); m_quoteSourceList->clear(); - QStringList::Iterator it; + TQStringList::Iterator it; for(it = groups.begin(); it != groups.end(); ++it) { - new QListViewItem(m_quoteSourceList, *it); + new TQListViewItem(m_quoteSourceList, *it); if(updateResetList) m_resetList += WebPriceQuoteSource(*it); } - QListViewItem* first = m_quoteSourceList->firstChild(); + TQListViewItem* first = m_quoteSourceList->firstChild(); if(first) m_quoteSourceList->setSelected(first, true); slotLoadWidgets(first); - m_newButton->setEnabled(m_quoteSourceList->findItem(i18n("New Quote Source"), 0) == 0); + m_newButton->setEnabled(m_quoteSourceList->tqfindItem(i18n("New Quote Source"), 0) == 0); } void KSettingsOnlineQuotes::resetConfig(void) { - QStringList::ConstIterator it; - QStringList groups = WebPriceQuote::quoteSources(); + TQStringList::ConstIterator it; + TQStringList groups = WebPriceQuote::quoteSources(); // delete all currently defined entries for(it = groups.begin(); it != groups.end(); ++it) { @@ -118,7 +118,7 @@ void KSettingsOnlineQuotes::resetConfig(void) } // and write back the one's from the reset list - QValueList::ConstIterator itr; + TQValueList::ConstIterator itr; for(itr = m_resetList.begin(); itr != m_resetList.end(); ++itr) { (*itr).write(); } @@ -126,7 +126,7 @@ void KSettingsOnlineQuotes::resetConfig(void) loadList(); } -void KSettingsOnlineQuotes::slotLoadWidgets(QListViewItem* item) +void KSettingsOnlineQuotes::slotLoadWidgets(TQListViewItem* item) { m_editURL->setEnabled(true); m_editSymbol->setEnabled(true); @@ -134,11 +134,11 @@ void KSettingsOnlineQuotes::slotLoadWidgets(QListViewItem* item) m_editDate->setEnabled(true); m_editDateFormat->setEnabled(true); m_skipStripping->setEnabled(true); - m_editURL->setText(QString()); - m_editSymbol->setText(QString()); - m_editPrice->setText(QString()); - m_editDate->setText(QString()); - m_editDateFormat->setText(QString()); + m_editURL->setText(TQString()); + m_editSymbol->setText(TQString()); + m_editPrice->setText(TQString()); + m_editDate->setText(TQString()); + m_editDateFormat->setText(TQString()); if(item) { m_currentItem = WebPriceQuoteSource(item->text(0)); @@ -190,17 +190,17 @@ void KSettingsOnlineQuotes::slotNewEntry(void) WebPriceQuoteSource newSource(i18n("New Quote Source")); newSource.write(); loadList(); - QListViewItem* item = m_quoteSourceList->findItem(i18n("New Quote Source"), 0); + TQListViewItem* item = m_quoteSourceList->tqfindItem(i18n("New Quote Source"), 0); if(item) { m_quoteSourceList->setSelected(item, true); slotLoadWidgets(item); } } -void KSettingsOnlineQuotes::slotEntryRenamed(QListViewItem* item, const QString& text, int /* col */) +void KSettingsOnlineQuotes::slotEntryRenamed(TQListViewItem* item, const TQString& text, int /* col */) { int nameCount = 0; - QListViewItemIterator it(m_quoteSourceList); + TQListViewItemIterator it(m_quoteSourceList); while(it.current()) { if(it.current()->text(0) == text) ++nameCount; @@ -213,7 +213,7 @@ void KSettingsOnlineQuotes::slotEntryRenamed(QListViewItem* item, const QString& } else { item->setText(0, m_currentItem.m_name); } - m_newButton->setEnabled(m_quoteSourceList->findItem(i18n("New Quote Source"), 0) == 0); + m_newButton->setEnabled(m_quoteSourceList->tqfindItem(i18n("New Quote Source"), 0) == 0); } #include "ksettingsonlinequotes.moc" diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h index 8c0b6f0..ef9abe2 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KSETTINGSONLINEQUOTES_H -#define KSETTINGSONLINEQUOTES_H +#ifndef KSETTINGSONLINETQUOTES_H +#define KSETTINGSONLINETQUOTES_H // ---------------------------------------------------------------------------- // QT Includes @@ -33,8 +33,9 @@ class KSettingsOnlineQuotes : public KSettingsOnlineQuotesDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsOnlineQuotes(QWidget* parent = 0, const char *name = 0); + KSettingsOnlineQuotes(TQWidget* tqparent = 0, const char *name = 0); virtual ~KSettingsOnlineQuotes() {} void writeConfig(void) {} @@ -43,16 +44,16 @@ public: protected slots: void slotUpdateEntry(void); - void slotLoadWidgets(QListViewItem* item); + void slotLoadWidgets(TQListViewItem* item); void slotEntryChanged(void); void slotNewEntry(void); - void slotEntryRenamed(QListViewItem* item, const QString& text, int col); + void slotEntryRenamed(TQListViewItem* item, const TQString& text, int col); protected: void loadList(const bool updateResetList = false); private: - QValueList m_resetList; + TQValueList m_resetList; WebPriceQuoteSource m_currentItem; }; diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui index 3077b78..88678ec 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui @@ -1,6 +1,6 @@ KSettingsOnlineQuotesDecl - + KSettingsOnlineQuotesDecl @@ -12,7 +12,7 @@ 442 - + 0 0 @@ -58,7 +58,7 @@ true - + groupParsing @@ -72,7 +72,7 @@ unnamed - + textLabel4 @@ -80,7 +80,7 @@ Date - + textLabel2 @@ -115,7 +115,7 @@ Enter the URL from which stock quotes will be fetched. <b>%1</b> will be replaced with the symbol for the security being quoted. For currency conversions, <b>%2</b> will be replaced with the currency to be quoted and <b>%1</b> with the currency the quote is based on. - + textLabel3 @@ -131,7 +131,7 @@ Regular Expression to extract the date from the downloaded data - + textLabel4_2 @@ -139,7 +139,7 @@ Date Format - + textLabel1 @@ -155,7 +155,7 @@ Regular Expression to extract the date from the downloaded data - + m_skipStripping @@ -177,9 +177,9 @@ - + - layout15 + tqlayout15 @@ -211,7 +211,7 @@ Expanding - + 240 20 @@ -230,5 +230,5 @@ - + diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp index 0887315..b44e124 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp +++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp @@ -18,9 +18,9 @@ // ---------------------------------------------------------------------------- // QT Includes -#include -#include -#include +#include +#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -35,13 +35,13 @@ #include "kmymoney2/plugins/pluginloader.h" #include "ksettingsplugins.h" -KSettingsPlugins::KSettingsPlugins(QWidget* parent) - : QWidget(parent) +KSettingsPlugins::KSettingsPlugins(TQWidget* tqparent) + : TQWidget(tqparent) { - QVBoxLayout *layout = new QVBoxLayout(this); - KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, QPoint()); - layout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); - layout->setSpacing(KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, TQPoint()); + tqlayout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); + tqlayout->setSpacing(KDialog::spacingHint()); } KSettingsPlugins::~KSettingsPlugins() diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.h b/kmymoney2/dialogs/settings/ksettingsplugins.h index 9c36f67..0106afb 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.h +++ b/kmymoney2/dialogs/settings/ksettingsplugins.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include // ---------------------------------------------------------------------------- // KDE Includes @@ -29,13 +29,14 @@ // ---------------------------------------------------------------------------- // Project Includes -class KSettingsPlugins : public QWidget +class KSettingsPlugins : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KSettingsPlugins(QWidget* parent = 0); + KSettingsPlugins(TQWidget* tqparent = 0); ~KSettingsPlugins(); public slots: diff --git a/kmymoney2/dialogs/settings/ksettingsregister.cpp b/kmymoney2/dialogs/settings/ksettingsregister.cpp index 9f1fda2..e6a278e 100644 --- a/kmymoney2/dialogs/settings/ksettingsregister.cpp +++ b/kmymoney2/dialogs/settings/ksettingsregister.cpp @@ -28,8 +28,8 @@ #include "ksettingsregister.h" #include -KSettingsRegister::KSettingsRegister(QWidget* parent, const char* name) : - KSettingsRegisterDecl(parent, name) +KSettingsRegister::KSettingsRegister(TQWidget* tqparent, const char* name) : + KSettingsRegisterDecl(tqparent, name) { // hide the internally used text fields kcfg_sortNormalView->hide(); @@ -37,14 +37,14 @@ KSettingsRegister::KSettingsRegister(QWidget* parent, const char* name) : kcfg_sortSearchView->hide(); // setup connections, so that the sort optios get loaded once the edit fields are filled - connect(kcfg_sortNormalView, SIGNAL(textChanged()), this, SLOT(slotLoadNormal())); - connect(kcfg_sortReconcileView, SIGNAL(textChanged()), this, SLOT(slotLoadReconcile())); - connect(kcfg_sortSearchView, SIGNAL(textChanged()), this, SLOT(slotLoadSearch())); + connect(kcfg_sortNormalView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadNormal())); + connect(kcfg_sortReconcileView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadReconcile())); + connect(kcfg_sortSearchView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadSearch())); // setup connections, so that changes by the user are forwarded to the (hidden) edit fields - connect(m_sortNormalView, SIGNAL(settingsChanged(const QString&)), kcfg_sortNormalView, SLOT(setText(const QString&))); - connect(m_sortReconcileView, SIGNAL(settingsChanged(const QString&)), kcfg_sortReconcileView, SLOT(setText(const QString&))); - connect(m_sortSearchView, SIGNAL(settingsChanged(const QString&)), kcfg_sortSearchView, SLOT(setText(const QString&))); + connect(m_sortNormalView, TQT_SIGNAL(settingsChanged(const TQString&)), kcfg_sortNormalView, TQT_SLOT(setText(const TQString&))); + connect(m_sortReconcileView, TQT_SIGNAL(settingsChanged(const TQString&)), kcfg_sortReconcileView, TQT_SLOT(setText(const TQString&))); + connect(m_sortSearchView, TQT_SIGNAL(settingsChanged(const TQString&)), kcfg_sortSearchView, TQT_SLOT(setText(const TQString&))); } KSettingsRegister::~KSettingsRegister() @@ -54,21 +54,21 @@ KSettingsRegister::~KSettingsRegister() void KSettingsRegister::slotLoadNormal(void) { // only need this once - disconnect(kcfg_sortNormalView, SIGNAL(textChanged()), this, SLOT(slotLoadNormal())); + disconnect(kcfg_sortNormalView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadNormal())); m_sortNormalView->setSettings(kcfg_sortNormalView->text()); } void KSettingsRegister::slotLoadReconcile(void) { // only need this once - disconnect(kcfg_sortReconcileView, SIGNAL(textChanged()), this, SLOT(slotLoadReconcile())); + disconnect(kcfg_sortReconcileView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadReconcile())); m_sortReconcileView->setSettings(kcfg_sortReconcileView->text()); } void KSettingsRegister::slotLoadSearch(void) { // only need this once - disconnect(kcfg_sortSearchView, SIGNAL(textChanged()), this, SLOT(slotLoadSearch())); + disconnect(kcfg_sortSearchView, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotLoadSearch())); m_sortSearchView->setSettings(kcfg_sortSearchView->text()); } diff --git a/kmymoney2/dialogs/settings/ksettingsregister.h b/kmymoney2/dialogs/settings/ksettingsregister.h index bcad7eb..7fa475f 100644 --- a/kmymoney2/dialogs/settings/ksettingsregister.h +++ b/kmymoney2/dialogs/settings/ksettingsregister.h @@ -31,9 +31,10 @@ class KSettingsRegister : public KSettingsRegisterDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsRegister(QWidget* parent = 0, const char* name = 0); + KSettingsRegister(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsRegister(); protected slots: diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui index c03807e..1ad71bf 100644 --- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui @@ -1,6 +1,6 @@ KSettingsRegisterDecl - + KSettingsRegisterDecl @@ -19,11 +19,11 @@ unnamed - + tab - + tab @@ -34,7 +34,7 @@ unnamed - + kcfg_ShowGrid @@ -45,7 +45,7 @@ - + kcfg_LedgerLens @@ -59,7 +59,7 @@ Using the ledger lens shows the details for the transaction that has focus in the ledger. Usually, when using the transaction form, only a one line summary is displayed for each transaction as the details are shown in the form. - + kcfg_TransactionForm @@ -67,7 +67,7 @@ Show transaction form - + kcfg_AlwaysShowNrField @@ -78,7 +78,7 @@ - + kcfg_ShowFancyMarker @@ -92,7 +92,7 @@ Draws a larger header above each group of transaction. The grouping depends on the current sort order. - + kcfg_ShowFiscalMarker @@ -110,7 +110,7 @@ Expanding - + 20 40 @@ -119,7 +119,7 @@ - + sorting @@ -130,11 +130,11 @@ unnamed - + tabWidget3 - + tab @@ -157,7 +157,7 @@ - + tab @@ -180,7 +180,7 @@ - + TabPage @@ -214,7 +214,7 @@ - + TabPage @@ -225,7 +225,7 @@ unnamed - + kcfg_CopyTypeToNr @@ -233,7 +233,7 @@ Insert transaction type into No. field for new transactions - + kcfg_AutoIncCheckNumber @@ -244,7 +244,7 @@ - + kcfg_FocusChangeIsEnter @@ -252,7 +252,7 @@ Keep changes when selecting a different transaction/split - + kcfg_EnterMovesBetweenFields @@ -263,7 +263,7 @@ - + kcfg_stringMatchFromStart @@ -274,15 +274,15 @@ Mark this option, if you always want to match names e.g. for payees from the start. If unset, any substring is matched. - + - layout5 + tqlayout5 unnamed - + textLabel2_2 @@ -323,7 +323,7 @@ Expanding - + 31 20 @@ -332,7 +332,7 @@ - + kcfg_AutoFillTransaction @@ -349,7 +349,7 @@ unnamed - + radioButton1 @@ -360,15 +360,15 @@ Don't do autofill of transaction data at all. - + - layout4 + tqlayout4 unnamed - + radioButton2 @@ -398,7 +398,7 @@ Selecting 0% will list all transactions. Two transactions are usually treated identical for autofill, if they refer the same accounts. They are treated as different transactions though, when their amount varies by more than the percentage given here. - + textLabel2 @@ -409,7 +409,7 @@ Selecting 0% will list all transactions. - + radioButton3 @@ -432,7 +432,7 @@ Selecting 0% will list all transactions. Expanding - + 20 20 @@ -441,7 +441,7 @@ Selecting 0% will list all transactions. - + TabPage @@ -452,15 +452,15 @@ Selecting 0% will list all transactions. unnamed - + - layout4 + tqlayout4 unnamed - + textLabel1_2 @@ -498,7 +498,7 @@ Selecting 0% will list all transactions. Expanding - + 61 20 @@ -507,7 +507,7 @@ Selecting 0% will list all transactions. - + kcfg_askForPayeeCategory @@ -531,7 +531,7 @@ Selecting 0% will list all transactions. Expanding - + 20 60 @@ -545,5 +545,8 @@ Selecting 0% will list all transactions. - + + kmymoney/transactionsortoption.h + + diff --git a/kmymoney2/dialogs/settings/ksettingsschedules.cpp b/kmymoney2/dialogs/settings/ksettingsschedules.cpp index 6f9a77c..05dc80f 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedules.cpp +++ b/kmymoney2/dialogs/settings/ksettingsschedules.cpp @@ -25,8 +25,8 @@ #include "ksettingsschedules.h" -KSettingsSchedules::KSettingsSchedules(QWidget* parent, const char* name) : - KSettingsSchedulesDecl(parent, name) +KSettingsSchedules::KSettingsSchedules(TQWidget* tqparent, const char* name) : + KSettingsSchedulesDecl(tqparent, name) { } diff --git a/kmymoney2/dialogs/settings/ksettingsschedules.h b/kmymoney2/dialogs/settings/ksettingsschedules.h index caa7d33..06e5af6 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedules.h +++ b/kmymoney2/dialogs/settings/ksettingsschedules.h @@ -32,9 +32,10 @@ class KSettingsSchedules : public KSettingsSchedulesDecl { Q_OBJECT + TQ_OBJECT public: - KSettingsSchedules(QWidget* parent = 0, const char* name = 0); + KSettingsSchedules(TQWidget* tqparent = 0, const char* name = 0); ~KSettingsSchedules(); }; #endif diff --git a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui index fca9aa9..4f7bd28 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui @@ -1,6 +1,6 @@ KSettingsSchedulesDecl - + KSettingsSchedulesDecl @@ -19,7 +19,7 @@ unnamed - + groupBox6 @@ -30,7 +30,7 @@ unnamed - + kcfg_CheckSchedule @@ -38,7 +38,7 @@ Check schedules on startup - + m_dayCountFrame @@ -55,7 +55,7 @@ unnamed - + textLabel3 @@ -63,7 +63,7 @@ Enter transactions this number of days in advance - + kcfg_CheckSchedulePreview @@ -72,15 +72,15 @@ - + - layout2 + tqlayout2 unnamed - + textLabel1 @@ -103,7 +103,7 @@ Expanding - + 41 21 @@ -122,7 +122,7 @@ Expanding - + 20 40 @@ -141,5 +141,5 @@ setEnabled(bool) - + -- cgit v1.2.1