diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:49 -0600 |
commit | 548395e018d377eaa8fede0fba271da8b6c49fc9 (patch) | |
tree | 6b6acd1baf1a63c2dfb1735461d8a1e2e20f8385 /src/ksvnwidgets | |
parent | bb7be2361770a435b3e2e8ae2ac4250bf9810bb4 (diff) | |
download | tdesvn-548395e018d377eaa8fede0fba271da8b6c49fc9.tar.gz tdesvn-548395e018d377eaa8fede0fba271da8b6c49fc9.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit bb7be2361770a435b3e2e8ae2ac4250bf9810bb4.
Diffstat (limited to 'src/ksvnwidgets')
-rw-r--r-- | src/ksvnwidgets/authdialogimpl.cpp | 4 | ||||
-rw-r--r-- | src/ksvnwidgets/authdlg.ui | 6 | ||||
-rw-r--r-- | src/ksvnwidgets/depthform.ui | 4 | ||||
-rw-r--r-- | src/ksvnwidgets/depthselector.cpp | 12 | ||||
-rw-r--r-- | src/ksvnwidgets/diffbrowser.cpp | 4 | ||||
-rw-r--r-- | src/ksvnwidgets/encodingselector.ui | 2 | ||||
-rw-r--r-- | src/ksvnwidgets/logmessage.ui | 8 | ||||
-rw-r--r-- | src/ksvnwidgets/logmsg_impl.cpp | 16 | ||||
-rw-r--r-- | src/ksvnwidgets/revertform.ui | 4 | ||||
-rw-r--r-- | src/ksvnwidgets/revertform_impl.cpp | 2 | ||||
-rw-r--r-- | src/ksvnwidgets/ssltrustprompt_impl.cpp | 2 |
11 files changed, 32 insertions, 32 deletions
diff --git a/src/ksvnwidgets/authdialogimpl.cpp b/src/ksvnwidgets/authdialogimpl.cpp index 879e49d..f445e78 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)") - .arg((Kdesvnsettings::passwords_in_wallet()?i18n("into KDE Wallet"):i18n("into subversions simple storage")))); + .tqarg((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(minimumSizeHint()) ); + resize( TQSize(334, 158).expandedTo(tqminimumSizeHint()) ); } } diff --git a/src/ksvnwidgets/authdlg.ui b/src/ksvnwidgets/authdlg.ui index 6b18120..b3facca 100644 --- a/src/ksvnwidgets/authdlg.ui +++ b/src/ksvnwidgets/authdlg.ui @@ -32,7 +32,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -82,7 +82,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> diff --git a/src/ksvnwidgets/depthform.ui b/src/ksvnwidgets/depthform.ui index 384bf72..bb738b1 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 children, but not subdirs. Updates will pull in any files not already present, but not subdirectories. +<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. </p> <p> <i>Immediate depth</i><br> @@ -80,7 +80,7 @@ Equivalent to the pre-1.5 default update behavior. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> diff --git a/src/ksvnwidgets/depthselector.cpp b/src/ksvnwidgets/depthselector.cpp index 4d1675b..6e9bb74 100644 --- a/src/ksvnwidgets/depthselector.cpp +++ b/src/ksvnwidgets/depthselector.cpp @@ -24,7 +24,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <layout.h> +#include <tqlayout.h> #include <tqcombobox.h> @@ -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->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + m_recurse->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); } DepthFormLayout->setMargin(0); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); adjustSize(); } @@ -56,11 +56,11 @@ DepthSelector::~DepthSelector() void DepthSelector::addItemWidget(TQWidget*aWidget) { DepthFormLayout->removeItem(m_leftspacer); - aWidget->reparent(this,geometry().topLeft()); + aWidget->reparent(this,tqgeometry().topLeft()); DepthFormLayout->addWidget(aWidget); - aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); DepthFormLayout->addItem(m_leftspacer); - setMinimumSize(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); } /*! diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 8e273cd..1e87d29 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -33,7 +33,7 @@ #include <tqfont.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <textcodec.h> +#include <tqtextcodec.h> /*! \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?").arg(saveTo)) + i18n("File %1 exists - overwrite?").tqarg(saveTo)) !=KMessageBox::Yes) { return; } diff --git a/src/ksvnwidgets/encodingselector.ui b/src/ksvnwidgets/encodingselector.ui index e1ce254..cb5249a 100644 --- a/src/ksvnwidgets/encodingselector.ui +++ b/src/ksvnwidgets/encodingselector.ui @@ -49,7 +49,7 @@ <property name="text"> <string>Select encoding:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/src/ksvnwidgets/logmessage.ui b/src/ksvnwidgets/logmessage.ui index 25e08a8..2199705 100644 --- a/src/ksvnwidgets/logmessage.ui +++ b/src/ksvnwidgets/logmessage.ui @@ -47,7 +47,7 @@ <property name="text"> <string>Review affected items</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -92,7 +92,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ <property name="text"> <string>Enter a log message</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -181,7 +181,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> diff --git a/src/ksvnwidgets/logmsg_impl.cpp b/src/ksvnwidgets/logmsg_impl.cpp index 97d67b1..037a66f 100644 --- a/src/ksvnwidgets/logmsg_impl.cpp +++ b/src/ksvnwidgets/logmsg_impl.cpp @@ -40,7 +40,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <tqlistview.h> -#include <layout.h> +#include <tqlayout.h> #include <tqwidget.h> #include <tqpushbutton.h> #include <tqfile.h> @@ -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").arg(current); + TQString key = TQString("log_%0").tqarg(current); s = cs.readEntry(key,TQString()); while (s!=TQString()) { if (current<smax_message_history) { @@ -233,7 +233,7 @@ void Logmsg_impl::initHistory() cs.deleteEntry(key); } ++current; - key = TQString("log_%0").arg(current); + key = TQString("log_%0").tqarg(current); s = cs.readEntry(key,TQString()); } } @@ -270,7 +270,7 @@ void Logmsg_impl::saveHistory(bool canceld) } KConfigGroup cs(Kdesvnsettings::self()->config(),"log_messages"); for (unsigned int i = 0; i < sLogHistory.size();++i) { - cs.writeEntry(TQString("log_%0").arg(i),sLogHistory[i]); + cs.writeEntry(TQString("log_%0").tqarg(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,geometry().topLeft()); +/* aWidget->reparent(this,tqgeometry().topLeft()); m_ItemsLayout->addWidget(aWidget); - kdDebug()<<"SizeHint: "<<aWidget->minimumSizeHint()<< endl; - aWidget->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); - setMinimumHeight(minimumSizeHint().height());*/ + kdDebug()<<"SizeHint: "<<aWidget->tqminimumSizeHint()<< endl; + aWidget->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + setMinimumHeight(tqminimumSizeHint().height());*/ } Logmsg_impl::logActionEntries Logmsg_impl::selectedEntries() diff --git a/src/ksvnwidgets/revertform.ui b/src/ksvnwidgets/revertform.ui index dacca01..1f413dc 100644 --- a/src/ksvnwidgets/revertform.ui +++ b/src/ksvnwidgets/revertform.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -50,7 +50,7 @@ <property name="name"> <cstring>m_DepthSelect</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> diff --git a/src/ksvnwidgets/revertform_impl.cpp b/src/ksvnwidgets/revertform_impl.cpp index 8b18508..91ad876 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(minimumSizeHint()); + setMinimumSize(tqminimumSizeHint()); } /*! diff --git a/src/ksvnwidgets/ssltrustprompt_impl.cpp b/src/ksvnwidgets/ssltrustprompt_impl.cpp index 2aca6b9..1791e80 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("<p align=\"center\"><b>"+ - i18n("Error validating server certificate for '%1'").arg(host)+ + i18n("Error validating server certificate for '%1'").tqarg(host)+ TQString("</b></p>")); } |