From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- kcontrol/kio/cache.cpp | 2 +- kcontrol/kio/cache_ui.ui | 4 ++-- kcontrol/kio/fakeuaprovider.cpp | 8 ++++---- kcontrol/kio/kcookiesmain.cpp | 2 +- kcontrol/kio/kcookiesmanagement.cpp | 2 +- kcontrol/kio/kcookiesmanagementdlg_ui.ui | 2 +- kcontrol/kio/kcookiespolicies.cpp | 4 ++-- kcontrol/kio/kcookiespoliciesdlg_ui.ui | 2 +- kcontrol/kio/kenvvarproxydlg.cpp | 10 +++++----- kcontrol/kio/kmanualproxydlg.cpp | 4 ++-- kcontrol/kio/kproxydlg.cpp | 2 +- kcontrol/kio/kproxydlg_ui.ui | 4 ++-- kcontrol/kio/main.cpp | 2 +- kcontrol/kio/manualproxy_ui.ui | 6 +++--- kcontrol/kio/netpref.cpp | 2 +- kcontrol/kio/policydlg.cpp | 4 ++-- kcontrol/kio/policydlg.h | 6 +++--- kcontrol/kio/smbrodlg.cpp | 6 +++--- kcontrol/kio/socks.cpp | 2 +- kcontrol/kio/socksbase.ui | 8 ++++---- kcontrol/kio/uagentproviderdlg.cpp | 4 ++-- kcontrol/kio/uagentproviderdlg_ui.ui | 4 ++-- kcontrol/kio/useragentdlg.cpp | 2 +- kcontrol/kio/useragentdlg_ui.ui | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) (limited to 'kcontrol/kio') diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp index d42ec45d4..d98cba302 100644 --- a/kcontrol/kio/cache.cpp +++ b/kcontrol/kio/cache.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui index ce9aed797..532173407 100644 --- a/kcontrol/kio/cache_ui.ui +++ b/kcontrol/kio/cache_ui.ui @@ -29,7 +29,7 @@ Fixed - + 16 21 @@ -88,7 +88,7 @@ MinimumExpanding - + 0 21 diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index 00a87567e..e48d15432 100644 --- a/kcontrol/kio/fakeuaprovider.cpp +++ b/kcontrol/kio/fakeuaprovider.cpp @@ -27,7 +27,7 @@ #include "fakeuaprovider.h" #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL(x) TQString::fromLatin1(x) +#define QFL(x) TQString::tqfromLatin1(x) FakeUASProvider::FakeUASProvider() { @@ -97,13 +97,13 @@ void FakeUASProvider::parseDescription() TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) + if( languageList.contains( TQString::tqfromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::fromLatin1("en"); + (*it) = TQString::tqfromLatin1("en"); } } diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp index 3bceb6acd..8233f0d20 100644 --- a/kcontrol/kio/kcookiesmain.cpp +++ b/kcontrol/kio/kcookiesmain.cpp @@ -3,7 +3,7 @@ // First version of cookies configuration by Waldo Bastian // This dialog box created by David Faure -#include +#include #include #include diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index 46b09b3f5..9a4f6eb2c 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui index e4fb65121..00a032a79 100644 --- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui @@ -119,7 +119,7 @@ MinimumExpanding - + 21 62 diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index fb63d8cf7..ac0b2572f 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -24,7 +24,7 @@ */ #include #include -#include +#include #include #include #include @@ -392,7 +392,7 @@ void KCookiesPolicies::save() while( at ) { - domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); + domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); at = at->nextSibling(); } diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui index 880b41cba..230ef9b5f 100644 --- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui @@ -161,7 +161,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su MinimumExpanding - + 20 16 diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp index 1069aa797..8d21c7a5b 100644 --- a/kcontrol/kio/kenvvarproxydlg.cpp +++ b/kcontrol/kio/kenvvarproxydlg.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed() setHighLight (mDlg->lbNoProxy, false); // Detect HTTP proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); // Detect HTTPS proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); // Detect FTP proxy settings... - found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); // Detect the NO_PROXY settings... - found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); + found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); if ( !found ) { diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index 3757d5bfb..b5961db7c 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name ) mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) ); TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); - mDlg->pbCopyDown->setSizePolicy( sizePolicy ); + mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy ); init(); } diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp index f9f13ea1d..bbe7a76bd 100644 --- a/kcontrol/kio/kproxydlg.cpp +++ b/kcontrol/kio/kproxydlg.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui index e2edb2d27..d053707db 100644 --- a/kcontrol/kio/kproxydlg_ui.ui +++ b/kcontrol/kio/kproxydlg_ui.ui @@ -115,7 +115,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro Fixed - + 16 20 @@ -300,7 +300,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX Fixed - + 16 20 diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp index c4de74e6a..96821defa 100644 --- a/kcontrol/kio/main.cpp +++ b/kcontrol/kio/main.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui index 43567977e..ecc061a64 100644 --- a/kcontrol/kio/manualproxy_ui.ui +++ b/kcontrol/kio/manualproxy_ui.ui @@ -137,7 +137,7 @@ sbHttp - + 32767 32767 @@ -160,7 +160,7 @@ Minimum - + 51 20 @@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox Expanding - + 20 114 diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp index 6ec5bcf05..1c1de3316 100644 --- a/kcontrol/kio/netpref.cpp +++ b/kcontrol/kio/netpref.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 23b962ad8..316fd7e80 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -70,7 +70,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); - setFixedSize (sizeHint()); + setFixedSize (tqsizeHint()); m_dlgUI->leDomain->setFocus (); } diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h index 2bf7a4c99..a67bfccaa 100644 --- a/kcontrol/kio/policydlg.h +++ b/kcontrol/kio/policydlg.h @@ -52,11 +52,11 @@ public: if (advice.isEmpty()) return KCookieAdvice::Dunno; - if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0) + if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) + else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) + else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 562124637..148af43d1 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -18,9 +18,9 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include -#include +#include #include #include @@ -140,7 +140,7 @@ void SMBRoOptions::save() for (uint i=0; i> 10; unsigned int a2 = (num & 0x3E0) >> 5; unsigned int a3 = (num & 0x1F); diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index 4e2502af9..fd1ce7d8e 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -20,7 +20,7 @@ */ -#include +#include #include #include #include diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui index 90e801249..3065ab229 100644 --- a/kcontrol/kio/socksbase.ui +++ b/kcontrol/kio/socksbase.ui @@ -127,7 +127,7 @@ _c_customPath - + 0 20 @@ -211,7 +211,7 @@ _c_newPath - + 0 25 @@ -236,7 +236,7 @@ MinimumExpanding - + 20 20 @@ -281,7 +281,7 @@ Expanding - + 20 0 diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp index fe6a286c8..5bf92cdb7 100644 --- a/kcontrol/kio/uagentproviderdlg.cpp +++ b/kcontrol/kio/uagentproviderdlg.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include #include @@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e ) TQString keycode = e->text(); if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || (cursorPosition() > 0 && key == Qt::Key_Minus) || - (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) ) + (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) ) { KLineEdit::keyPressEvent(e); return; diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui index 2082e3db4..7bf590208 100644 --- a/kcontrol/kio/uagentproviderdlg_ui.ui +++ b/kcontrol/kio/uagentproviderdlg_ui.ui @@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine. MinimumExpanding - + 21 16 @@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine. MinimumExpanding - + 29 20 diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index dca35ab8c..c34d5cadc 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include #include diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui index 1e5d55c4e..73b9dfd2e 100644 --- a/kcontrol/kio/useragentdlg_ui.ui +++ b/kcontrol/kio/useragentdlg_ui.ui @@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The Fixed - + 16 20 @@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The Expanding - + 21 16 -- cgit v1.2.1