From 1f9d00360b9018301630ce062d7dda0c6583edfb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:17 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943. --- kmymoney2/dialogs/settings/ksettingscolorsdecl.ui | 4 ++-- kmymoney2/dialogs/settings/ksettingsfontsdecl.ui | 6 +++--- kmymoney2/dialogs/settings/ksettingsforecastdecl.ui | 10 +++++----- kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui | 18 +++++++++--------- kmymoney2/dialogs/settings/ksettingsgpg.cpp | 4 ++-- kmymoney2/dialogs/settings/ksettingsgpgdecl.ui | 12 ++++++------ kmymoney2/dialogs/settings/ksettingshomedecl.ui | 16 ++++++++-------- .../dialogs/settings/ksettingsonlinequotesdecl.ui | 6 +++--- kmymoney2/dialogs/settings/ksettingsplugins.cpp | 8 ++++---- kmymoney2/dialogs/settings/ksettingsregisterdecl.ui | 16 ++++++++-------- kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui | 6 +++--- 11 files changed, 53 insertions(+), 53 deletions(-) (limited to 'kmymoney2/dialogs/settings') diff --git a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui index a2920fb..af307ac 100644 --- a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui @@ -157,7 +157,7 @@ Expanding - + 21 20 @@ -382,7 +382,7 @@ Expanding - + 20 20 diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui index a6e48f9..bffa088 100644 --- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui @@ -58,7 +58,7 @@ Expanding - + 110 20 @@ -75,7 +75,7 @@ Expanding - + 100 20 @@ -110,7 +110,7 @@ Expanding - + 20 30 diff --git a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui index 7c5139f..e70f01e 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui @@ -40,7 +40,7 @@ - layout7 + tqlayout7 @@ -48,7 +48,7 @@ - layout5 + tqlayout5 @@ -105,7 +105,7 @@ Expanding - + 133 21 @@ -187,7 +187,7 @@ Expanding - + 130 21 @@ -255,7 +255,7 @@ Expanding - + 20 40 diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui index c442639..9f8adaa 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui @@ -120,7 +120,7 @@ Expanding - + 61 21 @@ -194,7 +194,7 @@ Expanding - + 354 20 @@ -304,7 +304,7 @@ Expanding - + 90 20 @@ -323,7 +323,7 @@ Expanding - + 20 20 @@ -366,7 +366,7 @@ Check the views you want to enable, uncheck those you want to hide, because you don't need the functionality. - + WordBreak|AlignTop @@ -452,7 +452,7 @@ Expanding - + 20 21 @@ -554,7 +554,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden - layout2 + tqlayout2 @@ -588,7 +588,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden Expanding - + 63 20 @@ -620,7 +620,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden Expanding - + 20 30 diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp index 07b5d18..fc0c4eb 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp +++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp @@ -153,7 +153,7 @@ void KSettingsGpg::show(void) TQString name = fields[1]; name.replace('(', "["); name.replace(')', "]"); - name = TQString("%1 (0x%2)").arg(name).arg(fields[0]); + name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]); m_masterKeyCombo->insertItem(name); if(name.contains(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, TQString("%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/ksettingsgpgdecl.ui b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui index e256d73..09f846a 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui @@ -48,7 +48,7 @@ The <i>additional recovery encryption</i> is only accessible, if the - layout3 + tqlayout3 @@ -104,7 +104,7 @@ The <i>additional recovery encryption</i> is only accessible, if the - layout6 + tqlayout6 @@ -142,7 +142,7 @@ The <i>additional recovery encryption</i> is only accessible, if the Expanding - + 50 20 @@ -153,7 +153,7 @@ The <i>additional recovery encryption</i> is only accessible, if the - layout5 + tqlayout5 @@ -191,7 +191,7 @@ The <i>additional recovery encryption</i> is only accessible, if the Expanding - + 16 20 @@ -225,7 +225,7 @@ This mechanism is provided for the case that you have lost your key and cannot a Expanding - + 21 30 diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui index f6342f3..cc8eaff 100644 --- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui +++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui @@ -21,7 +21,7 @@ - layout9 + tqlayout9 @@ -29,7 +29,7 @@ - layout6 + tqlayout6 @@ -45,7 +45,7 @@ Fixed - + 20 20 @@ -78,7 +78,7 @@ Expanding - + 21 70 @@ -97,7 +97,7 @@ Expanding - + 80 21 @@ -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 @@ -193,7 +193,7 @@ Use the buttons and checkboxes to customize the layout of the home page. Expanding - + 40 20 diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui index ad68131..cc64bdb 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui @@ -12,7 +12,7 @@ 442 - + 0 0 @@ -179,7 +179,7 @@ - layout15 + tqlayout15 @@ -211,7 +211,7 @@ Expanding - + 240 20 diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp index 203db56..20434f6 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp +++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include +#include #include #include @@ -38,10 +38,10 @@ KSettingsPlugins::KSettingsPlugins(TQWidget* parent) : TQWidget(parent) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, TQPoint()); - layout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); - layout->setSpacing(KDialog::spacingHint()); + tqlayout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); + tqlayout->setSpacing(KDialog::spacingHint()); } KSettingsPlugins::~KSettingsPlugins() diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui index 0c23a4b..1d8f320 100644 --- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui @@ -110,7 +110,7 @@ Expanding - + 20 40 @@ -276,7 +276,7 @@ - layout5 + tqlayout5 @@ -323,7 +323,7 @@ Expanding - + 31 20 @@ -362,7 +362,7 @@ - layout4 + tqlayout4 @@ -432,7 +432,7 @@ Selecting 0% will list all transactions. Expanding - + 20 20 @@ -454,7 +454,7 @@ Selecting 0% will list all transactions. - layout4 + tqlayout4 @@ -498,7 +498,7 @@ Selecting 0% will list all transactions. Expanding - + 61 20 @@ -531,7 +531,7 @@ Selecting 0% will list all transactions. Expanding - + 20 60 diff --git a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui index 3fe9a40..94762cb 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui @@ -74,7 +74,7 @@ - layout2 + tqlayout2 @@ -103,7 +103,7 @@ Expanding - + 41 21 @@ -122,7 +122,7 @@ Expanding - + 20 40 -- cgit v1.2.1