From b0f531735b0175ba112ceb87d01731a7b2334772 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:24:43 -0600 Subject: Rename obsolete tq methods to standard names --- quanta/dialogs/actionconfigdialogs.ui | 4 ++-- quanta/dialogs/filecombo.cpp | 12 ++++++------ quanta/dialogs/fourbuttonmessagebox.ui | 2 +- quanta/dialogs/settings/filemaskss.ui | 2 +- quanta/dialogs/settings/previewoptions.cpp | 12 ++++++------ quanta/dialogs/settings/previewoptions.h | 2 +- quanta/dialogs/settings/previewoptionss.ui | 2 +- quanta/dialogs/settings/styleoptionss.ui | 4 ++-- quanta/dialogs/specialchardialogs.ui | 4 ++-- quanta/dialogs/tagdialogs/colorcombo.cpp | 2 +- quanta/dialogs/tagdialogs/colorcombo.h | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) (limited to 'quanta/dialogs') diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index 6f1da45d..fba7eaf9 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -39,7 +39,7 @@ - tqlayout17 + layout17 @@ -160,7 +160,7 @@ - tqlayout9 + layout9 diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 636559ce..63fd1e58 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -35,7 +35,7 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) baseURL = a_baseURL; m_absolutePath = false; - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); combo->setEditable(true); @@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - tqlayout ->addWidget( combo ); - tqlayout ->addWidget( button ); + layout ->addWidget( combo ); + layout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); @@ -58,7 +58,7 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) { baseURL.setPath("."); - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); button = new TQPushButton(this); @@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - tqlayout ->addWidget( combo ); - tqlayout ->addWidget( button ); + layout ->addWidget( combo ); + layout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index 0ec00485..ec85fa91 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -52,7 +52,7 @@ - tqlayout2 + layout2 diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index 5552afda..7fe28ce1 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -270,7 +270,7 @@ - tqlayout2 + layout2 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 7019795b..821cdfcc 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -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 diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index 06d9e91b..397c99af 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -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. diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index 3d187437..d29bd1ba 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -24,7 +24,7 @@ - tqlayout4 + layout4 @@ -105,7 +105,7 @@ - tqlayout3 + layout3 diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index b3af1391..19331def 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -24,7 +24,7 @@ // KColorDialog::getColor() so that in contains a parent argument. This // improves centering capability. // -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // // diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index 398ddca4..ac7ed429 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- // KDE color selection combo box -// tqlayout management added Oct 1997 by Mario Weilguni +// layout management added Oct 1997 by Mario Weilguni // -- cgit v1.2.1