diff options
Diffstat (limited to 'kcontrol/kio')
| -rw-r--r-- | kcontrol/kio/cache_ui.ui | 20 | ||||
| -rw-r--r-- | kcontrol/kio/envvarproxy_ui.ui | 16 | ||||
| -rw-r--r-- | kcontrol/kio/fakeuaprovider.cpp | 30 | ||||
| -rw-r--r-- | kcontrol/kio/kcookiesmanagement.cpp | 16 | ||||
| -rw-r--r-- | kcontrol/kio/kcookiesmanagement.h | 2 | ||||
| -rw-r--r-- | kcontrol/kio/kcookiesmanagementdlg_ui.ui | 36 | ||||
| -rw-r--r-- | kcontrol/kio/kcookiespolicies.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kio/kcookiespoliciesdlg_ui.ui | 40 | ||||
| -rw-r--r-- | kcontrol/kio/kenvvarproxydlg.cpp | 8 | ||||
| -rw-r--r-- | kcontrol/kio/kmanualproxydlg.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kio/kproxydlg_ui.ui | 44 | ||||
| -rw-r--r-- | kcontrol/kio/ksaveioconfig.cpp | 20 | ||||
| -rw-r--r-- | kcontrol/kio/manualproxy_ui.ui | 34 | ||||
| -rw-r--r-- | kcontrol/kio/policydlg.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/kio/policydlg.h | 6 | ||||
| -rw-r--r-- | kcontrol/kio/policydlg_ui.ui | 6 | ||||
| -rw-r--r-- | kcontrol/kio/smbrodlg.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kio/socksbase.ui | 40 | ||||
| -rw-r--r-- | kcontrol/kio/uagentproviderdlg.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kio/uagentproviderdlg_ui.ui | 18 | ||||
| -rw-r--r-- | kcontrol/kio/useragentdlg.cpp | 26 | ||||
| -rw-r--r-- | kcontrol/kio/useragentdlg_ui.ui | 34 |
22 files changed, 209 insertions, 209 deletions
diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui index c0e504057..532173407 100644 --- a/kcontrol/kio/cache_ui.ui +++ b/kcontrol/kio/cache_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CacheDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CacheDlgUI</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>lbMaxCacheSize</cstring> </property> @@ -67,7 +67,7 @@ <string> KB</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>pbClearCache</cstring> </property> @@ -88,14 +88,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>21</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>cbUseCache</cstring> </property> @@ -106,7 +106,7 @@ <string>Check this box if you want the web pages you visit to be stored on your hard disk for quicker access. The stored pages will only be updated as needed instead of on every visit to that site. This is especially useful if you have a slow connection to the Internet.</string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="5"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>bgCachePolicy</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbVerifyCache</cstring> </property> @@ -131,7 +131,7 @@ <string>Verify whether the cached web page is valid before attempting to fetch the web page again.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbCacheIfPossible</cstring> </property> @@ -142,7 +142,7 @@ <string>Always use documents from the cache when available. You can still use the reload button to synchronize the cache with the remote host.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbOfflineMode</cstring> </property> diff --git a/kcontrol/kio/envvarproxy_ui.ui b/kcontrol/kio/envvarproxy_ui.ui index 471b9f868..3e1babf90 100644 --- a/kcontrol/kio/envvarproxy_ui.ui +++ b/kcontrol/kio/envvarproxy_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EnvVarProxyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EnvVarProxyDlgUI</cstring> </property> @@ -41,7 +41,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbFtp</cstring> </property> @@ -58,7 +58,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbHttps</cstring> </property> @@ -75,7 +75,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>cbShowValue</cstring> </property> @@ -83,7 +83,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <string>Show the &value of the environment variables</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>pbVerify</cstring> </property> @@ -94,7 +94,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <string><qt>Verify whether or not the environment variable names you supplied are valid. If an environment variable is not found, the associated labels will be <b>highlighted</b> to indicate that they are invalid.</qt></string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>pbDetect</cstring> </property> @@ -105,7 +105,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <string><qt>Attempt automatic discovery of the environment variables used for setting system wide proxy information.<p> This feature works by searching for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY.</qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbHttp</cstring> </property> @@ -144,7 +144,7 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a </qt></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lbNoProxy</cstring> </property> diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index 00a87567e..2fe6d27f1 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() { @@ -37,11 +37,11 @@ FakeUASProvider::FakeUASProvider() FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr ) { TQStringList split; - int pos = (uaStr).find("::"); + int pos = (uaStr).tqfind("::"); if ( pos == -1 ) { - pos = (uaStr).find(':'); + pos = (uaStr).tqfind(':'); if ( pos != -1 ) { split.append(uaStr.left(pos)); @@ -53,7 +53,7 @@ FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString split = TQStringList::split("::", uaStr); } - if ( m_lstIdentity.contains(split[1]) ) + if ( m_lstIdentity.tqcontains(split[1]) ) return DUPLICATE_ENTRY; else { @@ -90,29 +90,29 @@ void FakeUASProvider::parseDescription() struct utsname utsn; uname( &utsn ); - tmp.replace( QFL("appSysName"), TQString(utsn.sysname) ); - tmp.replace( QFL("appSysRelease"), TQString(utsn.release) ); - tmp.replace( QFL("appMachineType"), TQString(utsn.machine) ); + tmp.tqreplace( QFL("appSysName"), TQString(utsn.sysname) ); + tmp.tqreplace( QFL("appSysRelease"), TQString(utsn.release) ); + tmp.tqreplace( QFL("appMachineType"), TQString(utsn.machine) ); TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); + TQStringList::Iterator it = languageList.tqfind( TQString::tqfromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) + if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::fromLatin1("en"); + (*it) = TQString::tqfromLatin1("en"); } } - tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); - tmp.replace( QFL("appPlatform"), QFL("X11") ); + tmp.tqreplace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); + tmp.tqreplace( QFL("appPlatform"), QFL("X11") ); } // Ignore dups... - if ( m_lstIdentity.contains(tmp) ) + if ( m_lstIdentity.tqcontains(tmp) ) continue; m_lstIdentity << tmp; @@ -133,7 +133,7 @@ void FakeUASProvider::parseDescription() TQString FakeUASProvider::aliasStr( const TQString& name ) { - int id = userAgentStringList().findIndex(name); + int id = userAgentStringList().tqfindIndex(name); if ( id == -1 ) return TQString::null; else @@ -142,7 +142,7 @@ TQString FakeUASProvider::aliasStr( const TQString& name ) TQString FakeUASProvider::agentStr( const TQString& name ) { - int id = userAgentAliasList().findIndex(name); + int id = userAgentAliasList().tqfindIndex(name); if ( id == -1 ) return TQString::null; else diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index f2cd45c42..da899be1f 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -94,9 +94,9 @@ CookieProp* CookieListViewItem::leaveCookie() TQString CookieListViewItem::text(int f) const { if (mCookie) - return f == 0 ? TQString::null : KIDNA::toUnicode(mCookie->host); + return f == 0 ? TQString() : KIDNA::toUnicode(mCookie->host); else - return f == 0 ? KIDNA::toUnicode(mDomain) : TQString::null; + return f == 0 ? KIDNA::toUnicode(mDomain) : TQString(); } KCookiesManagement::KCookiesManagement(TQWidget *parent) @@ -285,9 +285,9 @@ void KCookiesManagement::getCookies(TQListViewItem *cookieDom) DCOPReply reply = DCOPRef ("kded", "kcookiejar").call ("findCookies", DCOPArg(fields, "TQValueList<int>"), ckd->domain(), - TQString::null, - TQString::null, - TQString::null); + TQString(), + TQString(), + TQString()); if(reply.isValid()) { TQStringList fieldVal = reply; @@ -383,7 +383,7 @@ void KCookiesManagement::doPolicy() if( domain.isEmpty() ) { - CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->parent() ); + CookieListViewItem *parent = static_cast<CookieListViewItem*>( item->tqparent() ); if ( parent ) domain = parent->domain (); @@ -407,8 +407,8 @@ void KCookiesManagement::deleteCookie(TQListViewItem* deleteItem) CookieListViewItem *item = static_cast<CookieListViewItem*>( deleteItem ); if( item->cookie() ) { - CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->parent()); - CookiePropList *list = deletedCookies.find(parent->domain()); + CookieListViewItem *parent = static_cast<CookieListViewItem*>(item->tqparent()); + CookiePropList *list = deletedCookies.tqfind(parent->domain()); if(!list) { list = new CookiePropList; diff --git a/kcontrol/kio/kcookiesmanagement.h b/kcontrol/kio/kcookiesmanagement.h index cd7f4c62a..3e7588282 100644 --- a/kcontrol/kio/kcookiesmanagement.h +++ b/kcontrol/kio/kcookiesmanagement.h @@ -36,7 +36,7 @@ class KCookiesManagementDlgUI; struct CookieProp; -class CookieListViewItem : public QListViewItem +class CookieListViewItem : public TQListViewItem { public: CookieListViewItem(TQListView *parent, TQString dom); diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui index f36c0a707..00a032a79 100644 --- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCookiesManagementDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCookiesManagementDlgUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout6</cstring> </property> @@ -69,7 +69,7 @@ <number>15</number> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>layout4</cstring> </property> @@ -77,7 +77,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -85,7 +85,7 @@ <string>D&elete</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -93,7 +93,7 @@ <string>Delete A&ll</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbPolicy</cstring> </property> @@ -101,7 +101,7 @@ <string>Change &Policy...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbReload</cstring> </property> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>62</height> @@ -128,7 +128,7 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout3</cstring> </property> @@ -136,7 +136,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>tbClearSearchLine</cstring> </property> @@ -147,7 +147,7 @@ <string>Clear Search</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -173,7 +173,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>gbDetails</cstring> </property> @@ -208,7 +208,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbName</cstring> </property> @@ -219,7 +219,7 @@ <cstring>leName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbValue</cstring> </property> @@ -230,7 +230,7 @@ <cstring>leValue</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbDomain</cstring> </property> @@ -241,7 +241,7 @@ <cstring>leDomain</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lbPath</cstring> </property> @@ -252,7 +252,7 @@ <cstring>lePath</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbExpires</cstring> </property> @@ -263,7 +263,7 @@ <cstring>leExpires</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lbSecure</cstring> </property> diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 63f4dd21a..163b9b14a 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -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(); } @@ -434,7 +434,7 @@ void KCookiesPolicies::defaults() void KCookiesPolicies::splitDomainAdvice (const TQString& cfg, TQString &domain, KCookieAdvice::Value &advice) { - int sepPos = cfg.findRev(':'); + int sepPos = cfg.tqfindRev(':'); // Ignore any policy that does not contain a domain... if ( sepPos <= 0 ) diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui index 435ca8640..230ef9b5f 100644 --- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KCookiesPolicyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KCookiesPolicyDlgUI</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>cbEnableCookies</cstring> </property> @@ -30,7 +30,7 @@ Please note that disabling cookie support might make many web sites unbrowsable. </qt></string> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>bgPreferences</cstring> </property> @@ -41,7 +41,7 @@ Please note that disabling cookie support might make many web sites unbrowsable. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbRejectCrossDomainCookies</cstring> </property> @@ -54,7 +54,7 @@ Reject the so called third-party cookies. These are cookies that originate from </qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbAutoAcceptSessionCookies</cstring> </property> @@ -68,7 +68,7 @@ Automatically accept temporary cookies meant to expire at the end of the current </qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbIgnoreCookieExpirationDate</cstring> </property> @@ -84,7 +84,7 @@ Treat all cookies as session cookies. Session cookies are small pieces of data t </widget> </vbox> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>bgDefault</cstring> </property> @@ -109,7 +109,7 @@ Determines how cookies received from a remote machine will be handled: <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPolicyAsk</cstring> </property> @@ -117,7 +117,7 @@ Determines how cookies received from a remote machine will be handled: <string>Ask &for confirmation</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPolicyAccept</cstring> </property> @@ -125,7 +125,7 @@ Determines how cookies received from a remote machine will be handled: <string>Accep&t all cookies</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPolicyReject</cstring> </property> @@ -135,7 +135,7 @@ Determines how cookies received from a remote machine will be handled: </widget> </vbox> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>gbDomainSpecific</cstring> </property> @@ -161,14 +161,14 @@ To add a new policy, simply click on the <b>Add...</b> button and su <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>layout3</cstring> </property> @@ -176,7 +176,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNew</cstring> </property> @@ -184,7 +184,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <string>&New...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbChange</cstring> </property> @@ -192,7 +192,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <string>Chan&ge...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -200,7 +200,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <string>D&elete</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -254,7 +254,7 @@ List of sites for which you have set a specific cookie policy. Specific policies </qt></string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>layout2</cstring> </property> @@ -262,7 +262,7 @@ List of sites for which you have set a specific cookie policy. Specific policies <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>tbClearSearchLine</cstring> </property> @@ -273,7 +273,7 @@ List of sites for which you have set a specific cookie policy. Specific policies <string>Clear Search</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp index 22accb4e9..8d21c7a5b 100644 --- a/kcontrol/kio/kenvvarproxydlg.cpp +++ b/kcontrol/kio/kenvvarproxydlg.cpp @@ -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 92e8a98e6..a9c8e6eca 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -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(); } @@ -337,7 +337,7 @@ bool KManualProxyDlg::handleDuplicate( const TQString& site ) TQListBoxItem* item = mDlg->lbExceptions->firstItem(); while ( item != 0 ) { - if ( item->text().findRev( site ) != -1 && + if ( item->text().tqfindRev( site ) != -1 && item != mDlg->lbExceptions->selectedItem() ) { TQString msg = i18n("You entered a duplicate address. " diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui index 1a6b5d6e2..d053707db 100644 --- a/kcontrol/kio/kproxydlg_ui.ui +++ b/kcontrol/kio/kproxydlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KProxyDialogUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProxyDlgUI</cstring> </property> @@ -28,7 +28,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbConfigure</cstring> </property> @@ -51,7 +51,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbNoProxy</cstring> </property> @@ -65,7 +65,7 @@ If you are uncertain whether or not you need to use a proxy server to connect to <string>Connect to the Internet directly.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbAutoDiscover</cstring> </property> @@ -83,7 +83,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro </qt></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbAutoScript</cstring> </property> @@ -97,7 +97,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <string>Use the specified proxy script URL to configure the proxy settings.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -115,7 +115,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -143,7 +143,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -151,7 +151,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbEnvVar</cstring> </property> @@ -176,7 +176,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </qt></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbEnvSetup</cstring> </property> @@ -192,7 +192,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -200,7 +200,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbManual</cstring> </property> @@ -222,7 +222,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Manually enter proxy server configuration information.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbManSetup</cstring> </property> @@ -240,7 +240,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbAuth</cstring> </property> @@ -254,7 +254,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPrompt</cstring> </property> @@ -268,7 +268,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Prompt for login information whenever it is required.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>rbPresetLogin</cstring> </property> @@ -282,7 +282,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Use the information below to login into proxy servers as needed.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout5</cstring> </property> @@ -300,7 +300,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -332,7 +332,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Login name.</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lbPassword</cstring> </property> @@ -346,7 +346,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <string>Login password.</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lbUsername</cstring> </property> @@ -364,7 +364,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbOptions</cstring> </property> @@ -378,7 +378,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbPersConn</cstring> </property> diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index 50d56d86e..c5c471a9f 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -82,7 +82,7 @@ void KSaveIOConfig::reparseConfiguration () void KSaveIOConfig::setReadTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ReadTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -90,7 +90,7 @@ void KSaveIOConfig::setReadTimeout( int _timeout ) void KSaveIOConfig::setConnectTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -98,7 +98,7 @@ void KSaveIOConfig::setConnectTimeout( int _timeout ) void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ProxyConnectTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -106,7 +106,7 @@ void KSaveIOConfig::setProxyConnectTimeout( int _timeout ) void KSaveIOConfig::setResponseTimeout( int _timeout ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry("ResponseTimeout", QMAX(MIN_TIMEOUT_VALUE,_timeout)); cfg->sync(); } @@ -115,7 +115,7 @@ void KSaveIOConfig::setResponseTimeout( int _timeout ) void KSaveIOConfig::setMarkPartial( bool _mode ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "MarkPartial", _mode ); cfg->sync(); } @@ -123,7 +123,7 @@ void KSaveIOConfig::setMarkPartial( bool _mode ) void KSaveIOConfig::setMinimumKeepSize( int _size ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "MinimumKeepSize", _size ); cfg->sync(); } @@ -131,7 +131,7 @@ void KSaveIOConfig::setMinimumKeepSize( int _size ) void KSaveIOConfig::setAutoResume( bool _mode ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "AutoResume", _mode ); cfg->sync(); } @@ -217,7 +217,7 @@ void KSaveIOConfig::setProxyConfigScript( const TQString& _url ) void KSaveIOConfig::setPersistentProxyConnection( bool enable ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "PersistentProxyConnection", enable ); cfg->sync(); } @@ -225,7 +225,7 @@ void KSaveIOConfig::setPersistentProxyConnection( bool enable ) void KSaveIOConfig::setPersistentConnections( bool enable ) { KConfig* cfg = config (); - cfg->setGroup( TQString::null ); + cfg->setGroup( TQString() ); cfg->writeEntry( "PersistentConnections", enable ); cfg->sync(); } @@ -234,7 +234,7 @@ void KSaveIOConfig::updateRunningIOSlaves (TQWidget *parent) { // Inform all running io-slaves about the changes... // if we cannot update, ioslaves inform the end user... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString())) { TQString caption = i18n("Update Failed"); TQString message = i18n("You have to restart the running applications " diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui index 1c8ef8634..ecc061a64 100644 --- a/kcontrol/kio/manualproxy_ui.ui +++ b/kcontrol/kio/manualproxy_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ManualProxyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ManualProxyDlgUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbServers</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbFtp</cstring> </property> @@ -49,7 +49,7 @@ <cstring>leFtp</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbHttps</cstring> </property> @@ -68,7 +68,7 @@ <cstring>leHttps</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbHttp</cstring> </property> @@ -137,7 +137,7 @@ <property name="name"> <cstring>sbHttp</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,14 +160,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>cbSameProxy</cstring> </property> @@ -175,7 +175,7 @@ <string>&Use the same proxy server for all protocols</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>pbCopyDown</cstring> </property> @@ -185,7 +185,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbExceptions</cstring> </property> @@ -196,7 +196,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbReverseProxy</cstring> </property> @@ -209,7 +209,7 @@ Reverse the use of the exception list. Checking this box will result in the prox </qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -217,7 +217,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -231,7 +231,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <string>Remove all proxy exception addresses from the list.</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -245,7 +245,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <string>Remove the selected proxy exception address from the list.</string> </property> </widget> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>pbNew</cstring> </property> @@ -256,7 +256,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <string>Add new proxy exception address to the list.</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>pbChange</cstring> </property> @@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>114</height> diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 463806266..316fd7e80 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -30,7 +30,7 @@ #include "policydlg_ui.h" -class DomainLineValidator : public QValidator +class DomainLineValidator : public TQValidator { public: DomainLineValidator(TQObject *parent) @@ -63,14 +63,14 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, m_dlgUI = new PolicyDlgUI (this); setMainWidget(m_dlgUI); - m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain)); + m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain))); m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 ); enableButtonOK( false ); 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..17616860f 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.tqfind (TQString::tqfromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) + else if (advice.tqfind (TQString::tqfromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) + else if (advice.tqfind (TQString::tqfromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; diff --git a/kcontrol/kio/policydlg_ui.ui b/kcontrol/kio/policydlg_ui.ui index 1bae63208..015359829 100644 --- a/kcontrol/kio/policydlg_ui.ui +++ b/kcontrol/kio/policydlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PolicyDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PolicyDlgUI</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbDomain</cstring> </property> @@ -45,7 +45,7 @@ Enter the host or domain to which this policy applies, e.g. <b>www.kde.org </qt></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lbPolicy</cstring> </property> diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 90dfd9170..e5337cbf2 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -101,7 +101,7 @@ void SMBRoOptions::load() // TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); // TQString m_encoding = TQTextCodec::codecForLocale()->name(); -// m_encodingList->setCurrentItem( _strList.findIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); +// m_encodingList->setCurrentItem( _strList.tqfindIndex( cfg->readEntry( "Encoding", m_encoding.lower() ) ) ); // unscramble TQString scrambled = cfg->readEntry( "Password" ); @@ -140,7 +140,7 @@ void SMBRoOptions::save() for (uint i=0; i<password.length(); i++) { TQChar c = password[i]; - unsigned int num = (c.unicode() ^ 173) + 17; + unsigned int num = (c.tqunicode() ^ 173) + 17; unsigned int a1 = (num & 0xFC00) >> 10; unsigned int a2 = (num & 0x3E0) >> 5; unsigned int a3 = (num & 0x1F); diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui index 5def84076..3065ab229 100644 --- a/kcontrol/kio/socksbase.ui +++ b/kcontrol/kio/socksbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SocksBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SocksBase</cstring> </property> @@ -26,7 +26,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>_c_enableSocks</cstring> </property> @@ -37,7 +37,7 @@ <string>Check this to enable SOCKS4 and SOCKS5 support in KDE applications and I/O subsystems.</string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>bg</cstring> </property> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>_c_detect</cstring> </property> @@ -65,7 +65,7 @@ <string>If you select Autodetect, then KDE will automatically search for an implementation of SOCKS on your computer.</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>_c_NEC</cstring> </property> @@ -79,7 +79,7 @@ <string>This will force KDE to use NEC SOCKS if it can be found.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>_c_custom</cstring> </property> @@ -93,7 +93,7 @@ <string>Select custom if you wish to use an unlisted SOCKS library. Please note that this may not always work as it depends on the API of the library which you specify (below).</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -101,7 +101,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>_c_customLabel</cstring> </property> @@ -127,7 +127,7 @@ <property name="name"> <cstring>_c_customPath</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -139,7 +139,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>_c_Dante</cstring> </property> @@ -155,7 +155,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>_c_addPaths</cstring> </property> @@ -180,7 +180,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Path</string> @@ -211,14 +211,14 @@ <property name="name"> <cstring>_c_newPath</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>25</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -236,14 +236,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_c_add</cstring> </property> @@ -251,7 +251,7 @@ <string>&Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_c_remove</cstring> </property> @@ -263,7 +263,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -281,14 +281,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_c_test</cstring> </property> diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp index 9e945948d..adab4b611 100644 --- a/kcontrol/kio/uagentproviderdlg.cpp +++ b/kcontrol/kio/uagentproviderdlg.cpp @@ -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; @@ -121,7 +121,7 @@ void UAProviderDlg::setSiteName( const TQString& text ) void UAProviderDlg::setIdentity( const TQString& text ) { - int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->findItem(text) ); + int id = dlg->cbAlias->listBox()->index( dlg->cbAlias->listBox()->tqfindItem(text) ); dlg->cbAlias->setCurrentItem( id ); slotActivated( dlg->cbAlias->currentText() ); if ( !dlg->leSite->isEnabled() ) diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui index 6f2a006ec..7bf590208 100644 --- a/kcontrol/kio/uagentproviderdlg_ui.ui +++ b/kcontrol/kio/uagentproviderdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>UAProviderDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UAProviderDlgUI</cstring> </property> @@ -24,7 +24,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lbSite</cstring> </property> @@ -52,7 +52,7 @@ Enter the site or domain name where a fake browser identification should be used </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lbAlias</cstring> </property> @@ -78,7 +78,7 @@ Select the browser identification to use whenever contacting the site you specif </qt></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lbIdentity</cstring> </property> @@ -117,14 +117,14 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="8" column="0"> + <widget class="TQLayoutWidget" row="8" column="0"> <property name="name"> <cstring>layout3</cstring> </property> @@ -142,14 +142,14 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>29</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -160,7 +160,7 @@ The actual browser identification text that will be sent to the remote machine. <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index c34d5cadc..26476d9a8 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -111,12 +111,12 @@ void UserAgentDlg::load() dlg->cbSendUAString->setChecked( b ); m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower(); dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent( m_ua_keys ) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); updateButtons(); emit changed( false ); } @@ -135,12 +135,12 @@ void UserAgentDlg::defaults() dlg->lvDomainPolicyList->clear(); m_ua_keys = DEFAULT_USER_AGENT_KEYS; dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent(m_ua_keys) ); - dlg->cbOS->setChecked( m_ua_keys.contains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); + dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); dlg->cbSendUAString->setChecked( true ); updateButtons(); configChanged(); @@ -351,7 +351,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int ) if ( dlg->cbLanguage->isChecked() ) m_ua_keys += 'l'; - dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o')); + dlg->cbOSVersion->setEnabled(m_ua_keys.tqcontains('o')); TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys ); if ( dlg->leDefaultId->text() != modVal ) diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui index 0db2a2440..73b9dfd2e 100644 --- a/kcontrol/kio/useragentdlg_ui.ui +++ b/kcontrol/kio/useragentdlg_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>UserAgentDlgUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UserAgentDlgUI</cstring> </property> @@ -25,7 +25,7 @@ To add a new site specific identification text, click the <code>New</co <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbSendUAString</cstring> </property> @@ -43,7 +43,7 @@ By default, only minimal identification information is sent to remote sites. The </qt></string> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>gbDefaultId</cstring> </property> @@ -88,7 +88,7 @@ By default, only minimal identification information is sent to remote sites. The <string>The browser identification text sent to the sites you visit. You can customize it using the options provided below.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbOS</cstring> </property> @@ -99,7 +99,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Includes your operating system's name in the browser identification text.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -117,14 +117,14 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbOSVersion</cstring> </property> @@ -140,7 +140,7 @@ By default, only minimal identification information is sent to remote sites. The </widget> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbPlatform</cstring> </property> @@ -151,7 +151,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Includes your platform type in the browser identification text</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbProcessorType</cstring> </property> @@ -162,7 +162,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Includes your machine's CPU type in the browser identification text.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbLanguage</cstring> </property> @@ -175,7 +175,7 @@ By default, only minimal identification information is sent to remote sites. The </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbDomainPolicy</cstring> </property> @@ -248,7 +248,7 @@ By default, only minimal identification information is sent to remote sites. The <string>List of sites for which the specified identification text will be used instead of the default one.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -256,7 +256,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbNew</cstring> </property> @@ -267,7 +267,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Add new identification text for a site.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbChange</cstring> </property> @@ -278,7 +278,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Change the selected identifier text.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -289,7 +289,7 @@ By default, only minimal identification information is sent to remote sites. The <string>Delete the selected identifier text.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbDeleteAll</cstring> </property> @@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>16</height> |