From bb7be2361770a435b3e2e8ae2ac4250bf9810bb4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:34:08 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/ksvnwidgets/authdialogimpl.cpp | 4 ++-- src/ksvnwidgets/authdlg.ui | 6 +++--- src/ksvnwidgets/depthform.ui | 4 ++-- src/ksvnwidgets/depthselector.cpp | 12 ++++++------ src/ksvnwidgets/diffbrowser.cpp | 4 ++-- src/ksvnwidgets/encodingselector.ui | 2 +- src/ksvnwidgets/logmessage.ui | 8 ++++---- src/ksvnwidgets/logmsg_impl.cpp | 16 ++++++++-------- src/ksvnwidgets/revertform.ui | 4 ++-- src/ksvnwidgets/revertform_impl.cpp | 2 +- src/ksvnwidgets/ssltrustprompt_impl.cpp | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/ksvnwidgets') diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp index f445e78..879e49d 100644 --- a/src/ksvnwidgets/authdialogimpl.cpp +++ b/src/ksvnwidgets/authdialogimpl.cpp @@ -35,10 +35,10 @@ AuthDialogImpl::AuthDialogImpl(const TQString & realm,const TQString&user,TQWidg TQString text = m_StorePasswordButton->text(); m_StorePasswordButton->setText( m_StorePasswordButton->text()+TQString(" (%1)") - .tqarg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage")))); + .arg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage")))); if (!realm.isEmpty()) { m_RealmLabel->setText(m_RealmLabel->text()+" "+realm); - resize( TQSize(334, 158).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(334, 158).expandedTo(minimumSizeHint()) ); } } diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui index b3facca..6b18120 100644 --- a/src/ksvnwidgets/authdlg.ui +++ b/src/ksvnwidgets/authdlg.ui @@ -32,7 +32,7 @@ - tqlayout4 + layout4 @@ -82,7 +82,7 @@ - tqlayout3 + layout3 @@ -129,7 +129,7 @@ Expanding - + 90 20 diff --git a/src/ksvnwidgets/depthform.ui b/src/ksvnwidgets/depthform.ui index bb738b1..384bf72 100644 --- a/src/ksvnwidgets/depthform.ui +++ b/src/ksvnwidgets/depthform.ui @@ -57,7 +57,7 @@ <i>empty depth</i><br>Just the named directory, no entries. Updates will not pull in any files or subdirectories not already present. </p> <p> -<i>Files depth</i><br>Folder and its file tqchildren, but not subdirs. Updates will pull in any files not already present, but not subdirectories. +<i>Files depth</i><br>Folder and its file children, but not subdirs. Updates will pull in any files not already present, but not subdirectories. </p> <p> <i>Immediate depth</i><br> @@ -80,7 +80,7 @@ Equivalent to the pre-1.5 default update behavior. Expanding - + 40 20 diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp index 6e9bb74..4d1675b 100644 --- a/src/ksvnwidgets/depthselector.cpp +++ b/src/ksvnwidgets/depthselector.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include @@ -42,11 +42,11 @@ DepthSelector::DepthSelector(TQWidget *parent, const char *name) m_recurse->setChecked( TRUE ); m_recurse->setText(i18n( "Recursive" )); DepthFormLayout->addWidget( m_recurse ); - m_recurse->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + m_recurse->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); } DepthFormLayout->setMargin(0); - setMinimumSize(tqminimumSizeHint()); + setMinimumSize(minimumSizeHint()); adjustSize(); } @@ -56,11 +56,11 @@ DepthSelector::~DepthSelector() void DepthSelector::addItemWidget(TQWidget*aWidget) { DepthFormLayout->removeItem(m_leftspacer); - aWidget->reparent(this,tqgeometry().topLeft()); + aWidget->reparent(this,geometry().topLeft()); DepthFormLayout->addWidget(aWidget); - aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); - setMinimumSize(tqminimumSizeHint()); + setMinimumSize(minimumSizeHint()); } /*! diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 1e87d29..8e273cd 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include /*! \fn DiffBrowser::DiffBrowser(TQWidget*parent=0,const char*name=0) @@ -96,7 +96,7 @@ void DiffBrowser::saveDiff() TQFile tfile(saveTo); if (tfile.exists()) { if (KMessageBox::warningYesNo(TQT_TQWIDGET(KApplication::activeModalWidget()), - i18n("File %1 exists - overwrite?").tqarg(saveTo)) + i18n("File %1 exists - overwrite?").arg(saveTo)) !=KMessageBox::Yes) { return; } diff --git a/src/ksvnwidgets/encodingselector.ui b/src/ksvnwidgets/encodingselector.ui index cb5249a..e1ce254 100644 --- a/src/ksvnwidgets/encodingselector.ui +++ b/src/ksvnwidgets/encodingselector.ui @@ -49,7 +49,7 @@ Select encoding: - + AlignVCenter|AlignRight diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui index 2199705..25e08a8 100644 --- a/src/ksvnwidgets/logmessage.ui +++ b/src/ksvnwidgets/logmessage.ui @@ -47,7 +47,7 @@ Review affected items - + AlignCenter @@ -92,7 +92,7 @@ - tqlayout5 + layout5 @@ -167,7 +167,7 @@ Enter a log message - + AlignCenter @@ -181,7 +181,7 @@ - tqlayout6 + layout6 diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index 037a66f..97d67b1 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -224,7 +224,7 @@ void Logmsg_impl::initHistory() KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); TQString s = TQString(); unsigned int current = 0; - TQString key = TQString("log_%0").tqarg(current); + TQString key = TQString("log_%0").arg(current); s = cs.readEntry(key,TQString()); while (s!=TQString()) { if (currentconfig(),"log_messages"); for (unsigned int i = 0; i < sLogHistory.size();++i) { - cs.writeEntry(TQString("log_%0").tqarg(i),sLogHistory[i]); + cs.writeEntry(TQString("log_%0").arg(i),sLogHistory[i]); } cs.sync(); } else { @@ -449,11 +449,11 @@ TQString Logmsg_impl::getLogmessage(const logActionEntries&_on, void Logmsg_impl::addItemWidget(TQWidget*aWidget) { m_DepthSelector->addItemWidget(aWidget); -/* aWidget->reparent(this,tqgeometry().topLeft()); +/* aWidget->reparent(this,geometry().topLeft()); m_ItemsLayout->addWidget(aWidget); - kdDebug()<<"SizeHint: "<tqminimumSizeHint()<< endl; - aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); - setMinimumHeight(tqminimumSizeHint().height());*/ + kdDebug()<<"SizeHint: "<minimumSizeHint()<< endl; + aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + setMinimumHeight(minimumSizeHint().height());*/ } Logmsg_impl::logActionEntries Logmsg_impl::selectedEntries() diff --git a/src/ksvnwidgets/revertform.ui b/src/ksvnwidgets/revertform.ui index 1f413dc..dacca01 100644 --- a/src/ksvnwidgets/revertform.ui +++ b/src/ksvnwidgets/revertform.ui @@ -20,7 +20,7 @@ 0 - + 0 20 @@ -50,7 +50,7 @@ m_DepthSelect - + 0 20 diff --git a/src/ksvnwidgets/revertform_impl.cpp b/src/ksvnwidgets/revertform_impl.cpp index 91ad876..8b18508 100644 --- a/src/ksvnwidgets/revertform_impl.cpp +++ b/src/ksvnwidgets/revertform_impl.cpp @@ -29,7 +29,7 @@ RevertFormImpl::RevertFormImpl(TQWidget*parent,const char*name) :RevertForm(parent,name) { - setMinimumSize(tqminimumSizeHint()); + setMinimumSize(minimumSizeHint()); } /*! diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index 1791e80..2aca6b9 100644 --- a/src/ksvnwidgets/ssltrustprompt_impl.cpp +++ b/src/ksvnwidgets/ssltrustprompt_impl.cpp @@ -36,7 +36,7 @@ SslTrustPrompt_impl::SslTrustPrompt_impl(const TQString&host,TQWidget *parent, c :SslTrustPrompt(parent, name) { m_MainLabel->setText("

"+ - i18n("Error validating server certificate for '%1'").tqarg(host)+ + i18n("Error validating server certificate for '%1'").arg(host)+ TQString("

")); } -- cgit v1.2.1