From 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:43 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- quanta/dialogs/settings/abbreviation.cpp | 10 +++++----- quanta/dialogs/settings/abbreviations.ui | 4 ++-- quanta/dialogs/settings/codetemplatedlgs.ui | 2 +- quanta/dialogs/settings/filemaskss.ui | 20 ++++++++++---------- quanta/dialogs/settings/parseroptionsui.ui | 8 ++++---- quanta/dialogs/settings/previewoptions.cpp | 12 ++++++------ quanta/dialogs/settings/previewoptions.h | 2 +- quanta/dialogs/settings/previewoptionss.ui | 6 +++--- quanta/dialogs/settings/styleoptionss.ui | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) (limited to 'quanta/dialogs/settings') diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 46805d0e..bfaae460 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include //kde includes @@ -97,7 +97,7 @@ void AbbreviationDlg::slotNewGroup() { if (qConfig.abbreviations.contains(groupName)) { - KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").tqarg(groupName), i18n("Group already exists")); + KMessageBox::error(this, i18n("There is already an abbreviation group called %1. Choose an unique name for the new group.").arg(groupName), i18n("Group already exists")); TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); } else { @@ -187,7 +187,7 @@ void AbbreviationDlg::slotRemoveTemplate() { TQListViewItem *item = templatesList->currentItem(); if (item && - KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) + KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the %1 template?").arg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1)); delete item; @@ -270,7 +270,7 @@ void AbbreviationDlg::saveTemplates() f.close(); } else { - KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").tqarg(s)); + KMessageBox::error(this, i18n("Cannot open the file %1 for writing.\nModified abbreviations will be lost when you quit Quanta.").arg(s)); } } diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index 0c9c232a..b73e902b 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -170,7 +170,7 @@ Preferred - + 20 30 @@ -255,7 +255,7 @@ Expanding - + 20 40 diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 82d1976f..7a1367b9 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -21,7 +21,7 @@ 72 - + 400 70 diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index e4c408d3..7fe28ce1 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -73,7 +73,7 @@ lineMarkup - + AlignLeft @@ -81,7 +81,7 @@ lineImage - + AlignLeft @@ -130,7 +130,7 @@ lineText - + AlignLeft @@ -146,7 +146,7 @@ 0 - + 0 0 @@ -172,7 +172,7 @@ Expanding - + 153 20 @@ -183,7 +183,7 @@ lineScript - + AlignLeft @@ -196,7 +196,7 @@ Default character &encoding: - + AlignVCenter|AlignLeft @@ -224,7 +224,7 @@ Expanding - + 20 50 @@ -270,7 +270,7 @@ - tqlayout2 + layout2 diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui index 2637e71d..14095623 100644 --- a/quanta/dialogs/settings/parseroptionsui.ui +++ b/quanta/dialogs/settings/parseroptionsui.ui @@ -29,7 +29,7 @@ 0 - + 0 0 @@ -74,7 +74,7 @@ Expanding - + 122 20 @@ -102,7 +102,7 @@ Expanding - + 122 20 @@ -282,7 +282,7 @@ Expanding - + 20 40 diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp index e1df2225..2df03ea9 100644 --- a/quanta/dialogs/settings/previewoptions.cpp +++ b/quanta/dialogs/settings/previewoptions.cpp @@ -31,9 +31,9 @@ PreviewOptions::PreviewOptions(TQWidget *parent, const char *name) PreviewOptions::~PreviewOptions(){ } -void PreviewOptions::setWindowLayout(const TQString& tqlayout ) +void PreviewOptions::setWindowLayout(const TQString& layout ) { - if ( tqlayout == "Default") resetLayout->setChecked(true); + if ( layout == "Default") resetLayout->setChecked(true); else resetLayout->setChecked(false); } @@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition() return position; } -TQString PreviewOptions::tqlayout() +TQString PreviewOptions::layout() { - TQString tqlayout = "Custom"; + TQString layout = "Custom"; if ( resetLayout->isChecked() ) - tqlayout = "Default"; - return tqlayout; + layout = "Default"; + return layout; } TQString PreviewOptions::closeButtons() diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index 24f1a765..a3cce15e 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -30,7 +30,7 @@ public: ~PreviewOptions(); TQString position(); - TQString tqlayout(); + TQString layout(); TQString closeButtons(); TQString docPosition(); uint toolviewTabs(); diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui index 02bdc979..821cdfcc 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -21,7 +21,7 @@ 512 - + 350 220 @@ -36,7 +36,7 @@ resetLayout - Reset window tqlayout to the default on the next startup + Reset window layout to the default on the next startup @@ -215,7 +215,7 @@ Expanding - + 20 30 diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index e14cfda6..397c99af 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -29,7 +29,7 @@ 0 - + 410 250 @@ -144,7 +144,7 @@ Expanding - + 20 30 @@ -183,8 +183,8 @@ Automatic &replacement of the accented characters - If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their tqunicode style notation, for the above case with <b>&#038;#225;</b>.<br> -We suggest to leave this option off and use an tqunicode or locale encoding for your documents. + If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their unicode style notation, for the above case with <b>&#038;#225;</b>.<br> +We suggest to leave this option off and use an unicode or locale encoding for your documents. -- cgit v1.2.1