summaryrefslogtreecommitdiffstats
path: root/kcontrol/kio
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcontrol/kio
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/kio')
-rw-r--r--kcontrol/kio/UA-DESKTOP-FILE-HOWTO10
-rw-r--r--kcontrol/kio/cache_ui.ui8
-rw-r--r--kcontrol/kio/envvarproxy_ui.ui4
-rw-r--r--kcontrol/kio/fakeuaprovider.cpp24
-rw-r--r--kcontrol/kio/fakeuaprovider.h4
-rw-r--r--kcontrol/kio/kcookiesmain.cpp4
-rw-r--r--kcontrol/kio/kcookiesmanagement.cpp2
-rw-r--r--kcontrol/kio/kcookiesmanagementdlg_ui.ui14
-rw-r--r--kcontrol/kio/kcookiespolicies.cpp4
-rw-r--r--kcontrol/kio/kcookiespoliciesdlg_ui.ui12
-rw-r--r--kcontrol/kio/kenvvarproxydlg.cpp8
-rw-r--r--kcontrol/kio/kmanualproxydlg.cpp4
-rw-r--r--kcontrol/kio/kproxydlg.cpp4
-rw-r--r--kcontrol/kio/kproxydlg_ui.ui18
-rw-r--r--kcontrol/kio/lanbrowser.desktop2
-rw-r--r--kcontrol/kio/main.cpp4
-rw-r--r--kcontrol/kio/main.h2
-rw-r--r--kcontrol/kio/manualproxy_ui.ui12
-rw-r--r--kcontrol/kio/policydlg.cpp2
-rw-r--r--kcontrol/kio/policydlg.h6
-rw-r--r--kcontrol/kio/policydlg_ui.ui6
-rw-r--r--kcontrol/kio/smbrodlg.cpp28
-rw-r--r--kcontrol/kio/socks.cpp4
-rw-r--r--kcontrol/kio/socksbase.ui18
-rw-r--r--kcontrol/kio/uagentproviderdlg.cpp2
-rw-r--r--kcontrol/kio/uagentproviderdlg_ui.ui12
-rw-r--r--kcontrol/kio/useragentdlg.cpp28
-rw-r--r--kcontrol/kio/useragentdlg_ui.ui14
28 files changed, 130 insertions, 130 deletions
diff --git a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO
index b0b32404e..8d67d9a37 100644
--- a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO
+++ b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO
@@ -37,7 +37,7 @@ to group the entries whenever necessary. Currently there are 5
approximations: IE, NN, MOZ, OP, MISC. These represent Internet
Explorer, Netscape Navigator, Mozilla, Opera and Miscellaneous
respectively. NOTE: you can enter any value here as it is just
-a place holder that would be automatically tqreplaced with the
+a place holder that would be automatically replaced with the
actual user-agent name (X-KDE-UA-NAME).
X-KDE-UA-FULL
@@ -46,7 +46,7 @@ TYPE: QString
TRANSLATE: NO
DESCRIPTION:
The full user-agent description that will be sent to the remote
-site. It can contain the following keywords that would be tqreplaced
+site. It can contain the following keywords that would be replaced
with the appropriate value as defined by "uname":
appSysName the name of the operating system (ex: Linux).
@@ -56,7 +56,7 @@ appSysRelease the version of the operating system (ex: 2.2.18).
appKDERelease the current release number as set by KDE (ex: 2.1.9 >=20010310).
appMachineType the processor or machine type (ex: i686).
-NOTE: if you use any of these values and want them to be tqreplaced
+NOTE: if you use any of these values and want them to be replaced
automatically, make sure you include the X-KDE-UA-DYNAMIC-ENTRY field
and set its value to 1 (for true).
@@ -98,7 +98,7 @@ DESCRIPTION:
A boolean that indicates whether the keywords described under
X-KDE-UA-FULL should be translated. Make sure this field is
there with its value set to "1" if you want the keywords to
-be tqreplaced appropriately.
+be replaced appropriately.
EXAMPLES:
@@ -127,7 +127,7 @@ X-KDE-UA-DYNAMIC-ENTRY=1
The first entry is a description file for Internet Explorer running on
a Windows 98 machine while the second one is an example of a description
file for Netscape browser using the "keyword" based approach to describe
-the fields that should be tqreplaced dynamically based on the current system
+the fields that should be replaced dynamically based on the current system
settings. Note that all "keyword" based desktop files should always set
X-KDE-UA-DYNAMIC-ENTRY to 1.
diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui
index 20368e748..c0e504057 100644
--- a/kcontrol/kio/cache_ui.ui
+++ b/kcontrol/kio/cache_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>CacheDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>21</height>
@@ -88,7 +88,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>21</height>
@@ -183,5 +183,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/kio/envvarproxy_ui.ui b/kcontrol/kio/envvarproxy_ui.ui
index 4a0130f46..471b9f868 100644
--- a/kcontrol/kio/envvarproxy_ui.ui
+++ b/kcontrol/kio/envvarproxy_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>EnvVarProxyDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -171,5 +171,5 @@ Alternatively, you can click on the &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
<tabstop>pbVerify</tabstop>
<tabstop>pbDetect</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp
index 1920ddad9..00a87567e 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/kio/fakeuaprovider.cpp
@@ -27,14 +27,14 @@
#include "fakeuaprovider.h"
#define UA_PTOS(x) (*it)->property(x).toString()
-#define QFL(x) TQString::tqfromLatin1(x)
+#define QFL(x) TQString::fromLatin1(x)
FakeUASProvider::FakeUASProvider()
{
m_bIsDirty = true;
}
-FakeUASProvider::tqStatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr )
+FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr )
{
TQStringList split;
int pos = (uaStr).find("::");
@@ -53,7 +53,7 @@ FakeUASProvider::tqStatusCode FakeUASProvider::createNewUAProvider( const TQStri
split = TQStringList::split("::", uaStr);
}
- if ( m_lstIdentity.tqcontains(split[1]) )
+ if ( m_lstIdentity.contains(split[1]) )
return DUPLICATE_ENTRY;
else
{
@@ -90,29 +90,29 @@ void FakeUASProvider::parseDescription()
struct utsname utsn;
uname( &utsn );
- tmp.tqreplace( QFL("appSysName"), TQString(utsn.sysname) );
- tmp.tqreplace( QFL("appSysRelease"), TQString(utsn.release) );
- tmp.tqreplace( QFL("appMachineType"), TQString(utsn.machine) );
+ tmp.replace( QFL("appSysName"), TQString(utsn.sysname) );
+ tmp.replace( QFL("appSysRelease"), TQString(utsn.release) );
+ tmp.replace( QFL("appMachineType"), TQString(utsn.machine) );
TQStringList languageList = KGlobal::locale()->languageList();
if ( languageList.count() )
{
- TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") );
+ TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
if( it != languageList.end() )
{
- if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 )
+ if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
languageList.remove( it );
else
- (*it) = TQString::tqfromLatin1("en");
+ (*it) = TQString::fromLatin1("en");
}
}
- tmp.tqreplace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) );
- tmp.tqreplace( QFL("appPlatform"), QFL("X11") );
+ tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) );
+ tmp.replace( QFL("appPlatform"), QFL("X11") );
}
// Ignore dups...
- if ( m_lstIdentity.tqcontains(tmp) )
+ if ( m_lstIdentity.contains(tmp) )
continue;
m_lstIdentity << tmp;
diff --git a/kcontrol/kio/fakeuaprovider.h b/kcontrol/kio/fakeuaprovider.h
index 01a6aeae5..8aedb639d 100644
--- a/kcontrol/kio/fakeuaprovider.h
+++ b/kcontrol/kio/fakeuaprovider.h
@@ -27,7 +27,7 @@ class TQStringList;
class FakeUASProvider
{
public:
- enum tqStatusCode {
+ enum StatusCode {
SUCCEEDED=0,
ALREADY_EXISTS,
DUPLICATE_ENTRY
@@ -36,7 +36,7 @@ public:
FakeUASProvider();
~FakeUASProvider(){};
- tqStatusCode createNewUAProvider( const TQString& );
+ StatusCode createNewUAProvider( const TQString& );
TQString aliasStr( const TQString& );
TQString agentStr( const TQString& );
TQStringList userAgentStringList();
diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp
index d8639d1be..8233f0d20 100644
--- a/kcontrol/kio/kcookiesmain.cpp
+++ b/kcontrol/kio/kcookiesmain.cpp
@@ -34,9 +34,9 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
"are stored on your computer."));
}
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
- tqlayout->addWidget(tab);
+ layout->addWidget(tab);
policies = new KCookiesPolicies(this);
tab->addTab(policies, i18n("&Policy"));
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index 85a16edd5..f2cd45c42 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -102,7 +102,7 @@ TQString CookieListViewItem::text(int f) const
KCookiesManagement::KCookiesManagement(TQWidget *parent)
: KCModule(parent, "kcmkio")
{
- // Toplevel tqlayout
+ // Toplevel layout
TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui
index 63f9a2008..f36c0a707 100644
--- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KCookiesManagementDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -21,7 +21,7 @@
</property>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<grid>
<property name="name">
@@ -71,7 +71,7 @@
</widget>
<widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
@@ -119,7 +119,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>62</height>
@@ -130,7 +130,7 @@
</widget>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -315,8 +315,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistviewsearchline.h</includehint>
</includehints>
diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp
index 00d2b9860..63f4dd21a 100644
--- a/kcontrol/kio/kcookiespolicies.cpp
+++ b/kcontrol/kio/kcookiespolicies.cpp
@@ -175,7 +175,7 @@ bool KCookiesPolicies::handleDuplicate( const TQString& domain, int advice )
{
TQString msg = i18n("<qt>A policy already exists for"
"<center><b>%1</b></center>"
- "Do you want to tqreplace it?</qt>").arg(domain);
+ "Do you want to replace it?</qt>").arg(domain);
int res = KMessageBox::warningContinueCancel(this, msg,
i18n("Duplicate Policy"),
i18n("Replace"));
@@ -392,7 +392,7 @@ void KCookiesPolicies::save()
while( at )
{
- domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
+ domainConfig.append(TQString::fromLatin1("%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 50b6805b4..435ca8640 100644
--- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KCookiesPolicyDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -161,7 +161,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -170,7 +170,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
</spacer>
<widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<vbox>
<property name="name">
@@ -256,7 +256,7 @@ List of sites for which you have set a specific cookie policy. Specific policies
</widget>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -314,8 +314,8 @@ List of sites for which you have set a specific cookie policy. Specific policies
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistviewsearchline.h</includehint>
diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp
index 8d21c7a5b..22accb4e9 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::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
// Detect HTTPS proxy settings...
- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
// Detect FTP proxy settings...
- found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
// Detect the NO_PROXY settings...
- found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
+ found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
if ( !found )
{
diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp
index 3b0745961..92e8a98e6 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->tqsetSizePolicy( sizePolicy );
+ mDlg->pbCopyDown->setSizePolicy( sizePolicy );
init();
}
@@ -423,7 +423,7 @@ bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const
// We only check for a relevant subset of characters that are
// not allowed in <authority> component of a URL.
- if ( host.tqcontains ('*') || host.tqcontains (' ') || host.tqcontains ('?') )
+ if ( host.contains ('*') || host.contains (' ') || host.contains ('?') )
return false;
if ( result )
diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp
index 5f43afce2..bbe7a76bd 100644
--- a/kcontrol/kio/kproxydlg.cpp
+++ b/kcontrol/kio/kproxydlg.cpp
@@ -43,10 +43,10 @@
KProxyOptions::KProxyOptions (TQWidget* parent )
:KCModule (parent, "kcmkio")
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
mTab = new TQTabWidget(this);
- tqlayout->addWidget(mTab);
+ layout->addWidget(mTab);
mProxy = new KProxyDialog(mTab);
mSocks = new KSocksConfig(mTab);
diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui
index c2f654358..1a6b5d6e2 100644
--- a/kcontrol/kio/kproxydlg_ui.ui
+++ b/kcontrol/kio/kproxydlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ProxyDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -99,7 +99,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
@@ -115,7 +115,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -145,7 +145,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout7</cstring>
+ <cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@@ -194,7 +194,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -284,7 +284,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -300,7 +300,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -433,8 +433,8 @@ Although a persistent proxy connection is faster, note that it only works correc
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/kio/lanbrowser.desktop
index 6959cba35..5d3965667 100644
--- a/kcontrol/kio/lanbrowser.desktop
+++ b/kcontrol/kio/lanbrowser.desktop
@@ -96,7 +96,7 @@ Comment[bn]=lisa, reslisa এবং ioslaves সেট-আপ
Comment[br]=Kefluniadur lisa, reslisa and skalvoù IO
Comment[bs]=Podesite lisa, reslisa i ioslaves
Comment[ca]=Arranja lisa, reslisa i els ioslaves
-Comment[cs]=Nastavení Lisa, ResLisa a potqmocných zařízení
+Comment[cs]=Nastavení Lisa, ResLisa a pomocných zařízení
Comment[csb]=Ùstôw lisa, reslisa ë procedurów wé/wi
Comment[cy]=Gosodiad lisa,reslisa a'r gweision-io
Comment[da]=Opsætning af lisa, reslisa og ioslaverne
diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp
index fb2c0edfd..96821defa 100644
--- a/kcontrol/kio/main.cpp
+++ b/kcontrol/kio/main.cpp
@@ -79,7 +79,7 @@ extern "C"
LanBrowser::LanBrowser(TQWidget *parent)
:KCModule(parent,"kcmkio")
-,tqlayout(this)
+,layout(this)
,tabs(this)
{
setQuickHelp( i18n("<h1>Local Network Browsing</h1>Here you setup your "
@@ -99,7 +99,7 @@ LanBrowser::LanBrowser(TQWidget *parent)
"the LISa Homepage</a> or contact Alexander Neundorf "
"&lt;<a href=\"mailto:neundorf@kde.org\">neundorf@kde.org</a>&gt;."));
- tqlayout.addWidget(&tabs);
+ layout.addWidget(&tabs);
smbPage = create_smb(&tabs, 0);
tabs.addTab(smbPage, i18n("&Windows Shares"));
diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h
index 9d3609924..5c6d35ef9 100644
--- a/kcontrol/kio/main.h
+++ b/kcontrol/kio/main.h
@@ -35,7 +35,7 @@ class LanBrowser:public KCModule
virtual void save();
private:
- TQVBoxLayout tqlayout;
+ TQVBoxLayout layout;
TQTabWidget tabs;
KCModule *smbPage;
KCModule *lisaPage;
diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui
index 6202a78ab..1c8ef8634 100644
--- a/kcontrol/kio/manualproxy_ui.ui
+++ b/kcontrol/kio/manualproxy_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ManualProxyDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -137,7 +137,7 @@
<property name="name">
<cstring>sbHttp</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>32767</height>
@@ -160,7 +160,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -211,7 +211,7 @@ Reverse the use of the exception list. Checking this box will result in the prox
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
@@ -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="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>114</height>
@@ -313,5 +313,5 @@ Reverse the use of the exception list. Checking this box will result in the prox
<tabstop>pbDelete</tabstop>
<tabstop>pbDeleteAll</tabstop>
</tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp
index 19cccaf22..463806266 100644
--- a/kcontrol/kio/policydlg.cpp
+++ b/kcontrol/kio/policydlg.cpp
@@ -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 (tqsizeHint());
+ setFixedSize (sizeHint());
m_dlgUI->leDomain->setFocus ();
}
diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h
index a67bfccaa..2bf7a4c99 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::tqfromLatin1("accept"), 0, false) == 0)
+ if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0)
return KCookieAdvice::Accept;
- else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0)
+ else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0)
return KCookieAdvice::Reject;
- else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0)
+ else if (advice.find (TQString::fromLatin1("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 627a985cf..1bae63208 100644
--- a/kcontrol/kio/policydlg_ui.ui
+++ b/kcontrol/kio/policydlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>PolicyDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -101,6 +101,6 @@ Select the desired policy:
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 93267c0e2..90dfd9170 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -38,40 +38,40 @@
SMBRoOptions::SMBRoOptions(TQWidget *parent)
: KCModule(parent, "kcmkio")
{
- TQGridLayout *tqlayout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
+ TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
KDialog::spacingHint());
TQLabel *label=new TQLabel(i18n("This is the configuration for the samba client only, not the server."),this);
- tqlayout->addMultiCellWidget(label,0,0,0,1);
+ layout->addMultiCellWidget(label,0,0,0,1);
m_userLe=new TQLineEdit(this);
label=new TQLabel(m_userLe,i18n("Default user name:"),this);
- tqlayout->addWidget(label,1,0);
- tqlayout->addWidget(m_userLe,1,1);
+ layout->addWidget(label,1,0);
+ layout->addWidget(m_userLe,1,1);
m_passwordLe=new TQLineEdit(this);
m_passwordLe->setEchoMode(TQLineEdit::Password);
label=new TQLabel(m_passwordLe,i18n("Default password:"),this);
- tqlayout->addWidget(label,2,0);
- tqlayout->addWidget(m_passwordLe,2,1);
+ layout->addWidget(label,2,0);
+ layout->addWidget(m_passwordLe,2,1);
/* m_workgroupLe=new TQLineEdit(this);
label=new TQLabel(m_workgroupLe,i18n("Workgroup:"),this);
- tqlayout->addWidget(label,3,0);
- tqlayout->addWidget(m_workgroupLe,3,1);
+ layout->addWidget(label,3,0);
+ layout->addWidget(m_workgroupLe,3,1);
m_showHiddenShares=new TQCheckBox(i18n("Show hidden shares"),this);
- tqlayout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
+ layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
m_encodingList = new KComboBox( false, this );
TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
m_encodingList->insertStringList( _strList );
label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
- tqlayout->addWidget( label, 3, 0 );
- tqlayout->addWidget( m_encodingList, 3, 1 );
+ layout->addWidget( label, 3, 0 );
+ layout->addWidget( m_encodingList, 3, 1 );
*/
- tqlayout->addWidget(new TQWidget(this),4,0);
+ layout->addWidget(new TQWidget(this),4,0);
// connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
@@ -79,7 +79,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent)
// connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
// connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) );
- tqlayout->setRowStretch(4, 1);
+ layout->setRowStretch(4, 1);
// finaly read the options
load();
@@ -140,7 +140,7 @@ void SMBRoOptions::save()
for (uint i=0; i<password.length(); i++)
{
TQChar c = password[i];
- unsigned int num = (c.tqunicode() ^ 173) + 17;
+ unsigned int num = (c.unicode() ^ 173) + 17;
unsigned int a1 = (num & 0xFC00) >> 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 3a322ab29..fd1ce7d8e 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/kio/socks.cpp
@@ -48,9 +48,9 @@ KSocksConfig::KSocksConfig(TQWidget *parent)
setAboutData( about );
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
base = new SocksBase(this);
- tqlayout->add(base);
+ layout->add(base);
connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int)));
diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui
index 03adb5202..5def84076 100644
--- a/kcontrol/kio/socksbase.ui
+++ b/kcontrol/kio/socksbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>SocksBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -15,9 +15,9 @@
<property name="caption">
<string>SOCKS</string>
</property>
- <property name="tqlayoutMargin" stdset="0">
+ <property name="layoutMargin" stdset="0">
</property>
- <property name="tqlayoutSpacing" stdset="0">
+ <property name="layoutSpacing" stdset="0">
</property>
<vbox>
<property name="name">
@@ -127,7 +127,7 @@
<property name="name">
<cstring>_c_customPath</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
@@ -211,7 +211,7 @@
<property name="name">
<cstring>_c_newPath</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -330,6 +330,6 @@
<include location="global" impldecl="in declaration">kurlrequester.h</include>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp
index 5bf92cdb7..9e945948d 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.tqunicode()->isLetterOrNumber()) )
+ (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
{
KLineEdit::keyPressEvent(e);
return;
diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui
index add8356d7..6f2a006ec 100644
--- a/kcontrol/kio/uagentproviderdlg_ui.ui
+++ b/kcontrol/kio/uagentproviderdlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>UAProviderDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine.
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>
@@ -126,7 +126,7 @@ The actual browser identification text that will be sent to the remote machine.
</spacer>
<widget class="QLayoutWidget" row="8" column="0">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine.
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>29</width>
<height>20</height>
@@ -197,8 +197,8 @@ The actual browser identification text that will be sent to the remote machine.
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kcombobox.h</includehint>
diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp
index 09ebe351f..c34d5cadc 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.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->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') );
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.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->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->cbSendUAString->setChecked( true );
updateButtons();
configChanged();
@@ -224,7 +224,7 @@ bool UserAgentDlg::handleDuplicate( const TQString& site,
{
TQString msg = i18n("<qt><center>Found an existing identification for"
"<br/><b>%1</b><br/>"
- "Do you want to tqreplace it?</center>"
+ "Do you want to replace it?</center>"
"</qt>").arg(site);
int res = KMessageBox::warningContinueCancel(this, msg,
i18n("Duplicate Identification"),
@@ -351,7 +351,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int )
if ( dlg->cbLanguage->isChecked() )
m_ua_keys += 'l';
- dlg->cbOSVersion->setEnabled(m_ua_keys.tqcontains('o'));
+ dlg->cbOSVersion->setEnabled(m_ua_keys.contains('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 2beb0beb1..0db2a2440 100644
--- a/kcontrol/kio/useragentdlg_ui.ui
+++ b/kcontrol/kio/useragentdlg_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>UserAgentDlgUI</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -101,7 +101,7 @@ By default, only minimal identification information is sent to remote sites. The
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -250,7 +250,7 @@ By default, only minimal identification information is sent to remote sites. The
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<vbox>
<property name="name">
@@ -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="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>16</height>
@@ -346,8 +346,8 @@ By default, only minimal identification information is sent to remote sites. The
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>klistview.h</includehint>